From 7dc8262c88cd40687fdf52770cf581c2b1c1e796 Mon Sep 17 00:00:00 2001
From: Laurent Bonnans <laurent.bonnans@here.com>
Date: Wed, 20 Jun 2018 17:11:32 +0200
Subject: Refactor some of the Jenkins pipeline stuff

Some options looked deprecated
---
 scripts/ci/Jenkinsfile | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'scripts')

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 {
   environment {
     TEST_LOCAL_CONF_APPEND = 'scripts/ci/local.conf.append'
     TEST_AKTUALIZR_DIR = 'aktualizr'
-    TEST_AKTUALIZR_BRANCH = 'origin/master'
+    TEST_AKTUALIZR_BRANCH = 'aktualizr/master'
   }
   stages {
     stage('checkout') {
@@ -11,14 +11,19 @@ pipeline {
         label 'bitbake'
       }
       steps {
-        dir('aktualizr') {
-          checkout([$class: 'GitSCM',
-              userRemoteConfigs: [[url: 'https://github.com/advancedtelematic/aktualizr']],
-              branches: [[name: '*/master']],
-              changelog: true,
-              poll: true,
-          ])
-        }
+        checkout([$class: 'GitSCM',
+            userRemoteConfigs: [
+              [url: 'https://github.com/advancedtelematic/aktualizr', name: 'aktualizr']
+            ],
+            branches: [[name: 'refs/heads/master']],
+            extensions: [
+              [$class: 'DisableRemotePoll'],
+              [$class: 'PruneStaleBranch'],
+              [$class: 'RelativeTargetDirectory',
+                relativeTargetDir: 'aktualizr'
+              ]
+            ],
+        ])
 
         checkout([$class: 'RepoScm',
             manifestRepositoryUrl: 'https://github.com/advancedtelematic/updater-repo',
-- 
cgit v1.2.3-54-g00ecf