Select lf-virtual1 as defaut slave (ut)

It allows verifying unit tests vs python3 and building docs (see
latest OpenStack upper-constraints)

Change-Id: Ie9566d4b1e0a288d5944c3111ec2dc0749be1975
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml
index 178df6a..9ceabb1 100644 (file)
--- a/jjb/functest/functest-kubernetes-project-jobs.yaml
+++ b/jjb/functest/functest-kubernetes-project-jobs.yaml
@@ -28,7 +28,7 @@
 
     phase:
       - 'unit-tests-and-docs':
-          slave-label: 'opnfv-build-ubuntu'
+          slave-label: 'lf-virtual1'
 
 - job-template:
     name: 'functest-kubernetes-verify-{stream}'

diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml
index 69df265..269ecee 100644 (file)
--- a/jjb/functest/functest-project-jobs.yaml
+++ b/jjb/functest/functest-project-jobs.yaml
@@ -28,7 +28,7 @@
 
     phase:
       - 'unit-tests-and-docs':
-          slave-label: 'opnfv-build-ubuntu'
+          slave-label: 'lf-virtual1'
 
 - job-template:
     name: 'functest-verify-{stream}'

diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml
index 39e73b7..6e6f445 100644 (file)
--- a/jjb/functest/xtesting-project-jobs.yaml
+++ b/jjb/functest/xtesting-project-jobs.yaml
@@ -28,7 +28,7 @@
 
     phase:
       - 'unit-tests-and-docs':
-          slave-label: 'opnfv-build-ubuntu'
+          slave-label: 'lf-virtual1'
 
 - job-template:
     name: 'xtesting-verify-{stream}'

diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index a415546..1a8ce41 100644 (file)
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -610,6 +610,24 @@
           default: $WORKSPACE/build_output
           description: "Directory where the build artifact will be located upon the completion of the build."
 
+- parameter:
+    name: 'lf-virtual1-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'lf-virtual1'
+          description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: BUILD_DIRECTORY
+          default: $WORKSPACE/build_output
+          description: "Directory where the build artifact will be located upon the completion of the build."
+
 - parameter:
     name: 'pharos-dashboard-defaults'
     parameters: