X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-macros.yaml;h=e2763b59e458acaa7326d4ed7658e94ab51de16d;hb=a096f1d4a66957c0d6ce5fa88e638a4500651ca0;hp=9ff14254695b9bb75cd37521d08b9f3f9be30935;hpb=aca27a6ba352694e9e83fd809933a1314860484c;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml
index 9ff14254..e2763b59 100644
--- a/jjb/cloud-infra/onap-macros.yaml
+++ b/jjb/cloud-infra/onap-macros.yaml
@@ -22,18 +22,6 @@
 - parameter:
     name: 'onap-parameter-macro'
     parameters:
-      - project-parameters:
-          project: '{project}'
-          branch: '{nordix-branch}'
-      - nordix-gerrit-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'
@@ -44,20 +32,12 @@
           description: 'Installer to use for deploying the scenario'
       - string:
           name: DEPLOY_SCENARIO
-          default: 'onap-oom-nofeature'
+          default: 'onap-nofeature-noha'
           description: 'Scenario to deploy and test'
       - string:
           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'
@@ -83,7 +63,7 @@
           !include-raw: ./onap-deploy.sh
 
 - builder:
-    name: 'oom-healthcheck-macro'
+    name: 'oom-hc-macro'
     builders:
       - shell:
           !include-raw: ./oom-healthcheck.sh
@@ -100,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: