From: mordkoff <Jeremy.Mordkoff@riftio.com>
Date: Thu, 14 Sep 2017 16:06:41 +0000 (+0200)
Subject: Merge "Use GERRIT_BRACH param in Jenkinsfile"
X-Git-Tag: v3.0.0rc~3
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=706d84720cce4449aabc931edd3a928d9d86590d;hp=-c

Merge "Use GERRIT_BRACH param in Jenkinsfile"
---

706d84720cce4449aabc931edd3a928d9d86590d
diff --combined Jenkinsfile
index cf1137b3b,a4a3fa3e0..a15eafe87
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@@ -6,17 -6,16 +6,17 @@@ properties(
          string(defaultValue: env.GERRIT_PATCHSET_REVISION, description: '', name: 'GERRIT_PATCHSET_REVISION'),
          string(defaultValue: 'https://osm.etsi.org/gerrit', description: '', name: 'PROJECT_URL_PREFIX'),
          booleanParam(defaultValue: true, description: '', name: 'BUILD_SYSTEM'),
 +        string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'),
      ])
  ])
  
  def devops_checkout() {
      dir('devops') {
-         git url: "${PROJECT_URL_PREFIX}/osm/devops"
+         git url: "${PROJECT_URL_PREFIX}/osm/devops", branch: params.GERRIT_BRANCH
      }
  }
  
 -node {
 +node('docker') {
      checkout scm
      devops_checkout()
  
@@@ -27,6 -26,5 +27,6 @@@
                             params.GERRIT_BRANCH,
                             params.GERRIT_REFSPEC,
                             params.GERRIT_PATCHSET_REVISION,
 -                           params.BUILD_SYSTEM)
 +                           params.BUILD_SYSTEM,
 +                           params.ARTIFACTORY_SERVER)
  }