cloud-infra: Reconfigure slave labels

Change-Id: Ife8a096724b3789c24bfa96b179e7fb227acc012

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index e9a1aa417bc84394647bf57f76bfb40d61d48931..e4c66a60898eb296874f2d8f87296dde60c5821d 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -53,12 +53,14 @@
 
     distro:
       - ubuntu1804:
+          slave-label: vpod-deploy-ubuntu1804
           disabled: false
           successful: false
           failed: false
           unstable: false
           notbuilt: false
       - centos7:
+          slave-label: vpod-deploy-centos7
           disabled: true
           successful: true
           failed: true
@@ -92,7 +94,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-deploy-city'
+          default: '{slave-label}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
           name: DISTRO

diff --git a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
index fae205870814ce7496467dcd9f75446dbfbcaf40..326a44689ae504cbd1699ac791841d7c93637565 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@ -50,12 +50,14 @@
 
     distro:
       - ubuntu1804:
+          slave-label: vpod-deploy-ubuntu1804
           disabled: false
           successful: false
           failed: false
           unstable: false
           notbuilt: false
       - centos7:
+          slave-label: vpod-deploy-centos7
           disabled: true
           successful: true
           failed: true
@@ -63,8 +65,7 @@
           notbuilt: true
 
     type:
-      - virtual:
-          slave-label: 'vpod-deploy-city'
+      - virtual
 
     phase:
       - deploy:

diff --git a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
index 110705c083fb157d7d6239c5626a4c3bb07b017e..578da7ac0ac235cb7b0931de8c79f6f935936917 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
@@ -55,6 +55,7 @@
     distro:
       - ubuntu1804:
           disabled: 'false'
+          slave-label: vpod-test-ubuntu1804
 
     type:
       - virtual
@@ -83,7 +84,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-test-{distro}'
+          default: '{slave-label}'
           description: 'Slave label to schedule this job on. These slaves have cloud infra installed on them.'
       - string:
           name: DISTRO