From: Fatih Degirmenci <fdegir@gmail.com>
Date: Wed, 16 Oct 2019 17:28:19 +0000 (+0200)
Subject: onap: Fix slave label for periodic jobs
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=ebfb38b198177d0db1474c2fbe67c9e90b005e7d;hp=76c4bd93acb50e0930829a07b43ed20797766076;p=infra%2Fcicd.git

onap: Fix slave label for periodic jobs

Change-Id: I94304e41ab1d4000b33e2eaaf2ee3e210093575e
---

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 68c5c5b5..e420ebce 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -120,6 +120,14 @@
           branch: '{nordix-branch}'
       - nordix-gerrit-parameters
       - onap-parameter-macro
+      - label:
+          name: SLAVE_LABEL
+          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
+          default: '{distro}'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: ONAP_VERSION
           default: '{onap-version}'
@@ -396,6 +404,7 @@
             - name: 'promote-onap-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
+                SLAVE_LABEL=$SLAVE_LABEL
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
@@ -448,6 +457,14 @@
           branch: '{nordix-branch}'
       - nordix-gerrit-parameters
       - onap-parameter-macro
+      - label:
+          name: SLAVE_LABEL
+          default: 'xerces-jumphost-onap-ubuntu1804'
+          description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
+      - string:
+          name: DISTRO
+          default: 'ubuntu1804'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: ONAP_FLAVOR
           default: '{onap-flavor}'
@@ -500,6 +517,14 @@
           branch: '{nordix-branch}'
       - nordix-gerrit-parameters
       - onap-parameter-macro
+      - label:
+          name: SLAVE_LABEL
+          default: 'xerces-jumphost-onap-ubuntu1804'
+          description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
+      - string:
+          name: DISTRO
+          default: 'ubuntu1804'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: ONAP_VERSION
           default: '{onap-version}'
diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml
index 19232120..e2763b59 100644
--- a/jjb/cloud-infra/onap-macros.yaml
+++ b/jjb/cloud-infra/onap-macros.yaml
@@ -22,14 +22,6 @@
 - parameter:
     name: 'onap-parameter-macro'
     parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'jumphost-onap-ubuntu1804'
-          description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
-      - string:
-          name: DISTRO
-          default: 'ubuntu1804'
-          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: PROVISIONER_TYPE
           default: 'heat'