Merge "Use GERRIT_BRACH param in Jenkinsfile"
authormordkoff <Jeremy.Mordkoff@riftio.com>
Thu, 14 Sep 2017 16:06:41 +0000 (18:06 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Thu, 14 Sep 2017 16:06:41 +0000 (18:06 +0200)
1  2 
Jenkinsfile

diff --combined 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)
  }