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 68c5c5b5547bfea09bd5a5771a2994429e091a17..e420ebceaee54af1e1cac10a356d65b325924de4 100644 (file)
--- 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 192321208d6de00c82ffc628d17f608e2d501170..e2763b59e458acaa7326d4ed7658e94ab51de16d 100644 (file)
--- 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'