summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLaurent Bonnans <laurent.bonnans@here.com>2018-06-20 17:11:32 +0200
committerLaurent Bonnans <laurent.bonnans@here.com>2018-06-21 16:33:44 +0200
commit7dc8262c88cd40687fdf52770cf581c2b1c1e796 (patch)
treef8842d2d62680bc8778640c1265651e12cc2e17a /scripts
parent81bdec797138ce2cdcfcea666caa5e64c8e4feb6 (diff)
downloadmeta-updater-7dc8262c88cd40687fdf52770cf581c2b1c1e796.tar.gz
Refactor some of the Jenkins pipeline stuff
Some options looked deprecated
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ci/Jenkinsfile23
1 files changed, 14 insertions, 9 deletions
diff --git a/scripts/ci/Jenkinsfile b/scripts/ci/Jenkinsfile
index 83bd49c..2a9f5cf 100644
--- a/scripts/ci/Jenkinsfile
+++ b/scripts/ci/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
3 environment { 3 environment {
4 TEST_LOCAL_CONF_APPEND = 'scripts/ci/local.conf.append' 4 TEST_LOCAL_CONF_APPEND = 'scripts/ci/local.conf.append'
5 TEST_AKTUALIZR_DIR = 'aktualizr' 5 TEST_AKTUALIZR_DIR = 'aktualizr'
6 TEST_AKTUALIZR_BRANCH = 'origin/master' 6 TEST_AKTUALIZR_BRANCH = 'aktualizr/master'
7 } 7 }
8 stages { 8 stages {
9 stage('checkout') { 9 stage('checkout') {
@@ -11,14 +11,19 @@ pipeline {
11 label 'bitbake' 11 label 'bitbake'
12 } 12 }
13 steps { 13 steps {
14 dir('aktualizr') { 14 checkout([$class: 'GitSCM',
15 checkout([$class: 'GitSCM', 15 userRemoteConfigs: [
16 userRemoteConfigs: [[url: 'https://github.com/advancedtelematic/aktualizr']], 16 [url: 'https://github.com/advancedtelematic/aktualizr', name: 'aktualizr']
17 branches: [[name: '*/master']], 17 ],
18 changelog: true, 18 branches: [[name: 'refs/heads/master']],
19 poll: true, 19 extensions: [
20 ]) 20 [$class: 'DisableRemotePoll'],
21 } 21 [$class: 'PruneStaleBranch'],
22 [$class: 'RelativeTargetDirectory',
23 relativeTargetDir: 'aktualizr'
24 ]
25 ],
26 ])
22 27
23 checkout([$class: 'RepoScm', 28 checkout([$class: 'RepoScm',
24 manifestRepositoryUrl: 'https://github.com/advancedtelematic/updater-repo', 29 manifestRepositoryUrl: 'https://github.com/advancedtelematic/updater-repo',