onap: Fix slave label for periodic jobs

[infra/cicd.git] / jjb / cloud-infra / onap-macros.yaml

diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml
index 9138f9f86851c2553555cf243d04c62caa4f4711..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'
@@ -46,14 +38,6 @@
           name: DEPLOY_TYPE
           default: 'cloud'
           description: 'Type of the deployment'
-      - string:
-          name: HEAT_ENVIRONMENT_FILE
-          default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/heat-environment-full.yaml"
-          description: 'Type of the deployment'
-      - string:
-          name: ONAP_FLAVOR
-          default: 'full'
-          description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.'
       - string:
           name: TEST_TYPE
           default: 'oom-healthcheck'
@@ -79,7 +63,7 @@
           !include-raw: ./onap-deploy.sh
 
 - builder:
-    name: 'oom-healthcheck-macro'
+    name: 'oom-hc-macro'
     builders:
       - shell:
           !include-raw: ./oom-healthcheck.sh
@@ -96,10 +80,4 @@
       - shell:
           !include-raw: ./promote-onap.sh
 
-- builder:
-    name: 'delete-stack-macro'
-    builders:
-      - shell:
-          !include-raw: ./delete-stack.sh
-
 # vim: set ts=2 sw=2 expandtab: