From: marchettim <mmarchetti@sandvine.com>
Date: Thu, 14 Sep 2017 15:18:22 +0000 (+0200)
Subject: Merge "Build on jenkins nodes with label docker"
X-Git-Tag: v3.0.0rc~4
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=5acb58bb62229a765a8527ccb536a7fab917802d;hp=-c

Merge "Build on jenkins nodes with label docker"
---

5acb58bb62229a765a8527ccb536a7fab917802d
diff --combined Jenkinsfile
index 853cc61e6,6ed5423d2..cf1137b3b
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@@ -6,7 -6,6 +6,7 @@@ 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'),
      ])
  ])
  
@@@ -16,7 -15,7 +16,7 @@@ def devops_checkout() 
      }
  }
  
- 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)
  }