From e28fcbfae845e567182f9841965b9a9a3ea135bb Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Wed, 17 Jul 2019 11:19:11 +0200
Subject: [PATCH] cloud-infra: Reconfigure slave labels

Change-Id: Ife8a096724b3789c24bfa96b179e7fb227acc012
---
 jjb/cloud-infra/cloud-infra-verify-engine.yaml   | 4 +++-
 jjb/cloud-infra/cloud-infra-verify-scenario.yaml | 5 +++--
 jjb/cloud-infra/cloud-infra-verify-testfw.yaml   | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index e9a1aa41..e4c66a60 100644
--- 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 fae20587..326a4468 100644
--- 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 110705c0..578da7ac 100644
--- 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
-- 
2.25.1