Merge branch 'v2.0'

Change-Id: I2793984f7d0fe713fb61c39564c44e68c9494972

diff --git a/Jenkinsfile b/Jenkinsfile
index bc6c2d0..6eea999 100644 (file)
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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: false, description: '', name: 'TEST_INSTALL'),
+        string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'),
     ])
 ])
 
@@ -15,7 +16,7 @@ def devops_checkout() {
     }
 }
 
-node {
+node('docker') {
     checkout scm
     devops_checkout()
 
@@ -26,5 +27,6 @@ node {
                            params.GERRIT_BRANCH,
                            params.GERRIT_REFSPEC,
                            params.GERRIT_PATCHSET_REVISION,
-                           params.TEST_INSTALL)
+                           params.TEST_INSTALL,
+                           params.ARTIFACTORY_SERVER)
 }

diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
index 4c35ccd..25de71a 100755 (executable)
--- a/devops-stages/stage-build.sh
+++ b/devops-stages/stage-build.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-make clean all BRANCH=v2.0
+make clean all BRANCH=master
 #make install && \
 #make test