Merge "Add master integration test job for metal3_dev_env"

[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 27860e82682544a3dd2c0ba3dc6358a1856e0658..e2763b59e458acaa7326d4ed7658e94ab51de16d 100644 (file)
--- a/jjb/cloud-infra/onap-macros.yaml
+++ b/jjb/cloud-infra/onap-macros.yaml
@@ -22,66 +22,26 @@
 - parameter:
     name: 'onap-parameter-macro'
     parameters:
-      - project-parameters:
-          project: '{project}'
-          branch: '{nordix-branch}'
-      - nordix-gerrit-parameters
-      - 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: PROVISIONER_TYPE
-          default: '{provisioner-type}'
+          default: 'heat'
           description: 'Provisioner to use for provisioning nodes'
       - string:
           name: INSTALLER_TYPE
-          default: '{installer-type}'
+          default: 'kubespray'
           description: 'Installer to use for deploying the scenario'
       - string:
           name: DEPLOY_SCENARIO
-          default: '{deploy-scenario}'
+          default: 'onap-nofeature-noha'
           description: 'Scenario to deploy and test'
       - string:
           name: DEPLOY_TYPE
-          default: '{type}'
-          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"
+          default: 'cloud'
           description: 'Type of the deployment'
-      - string:
-          name: ONAP_VERSION
-          default: '{onap-version}'
-          description: 'ONAP version to deploy'
-      - 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'
           description: 'Test type to run. Could be oom-healthcheck or onap-healthcheck'
-      - string:
-          name: ENGINE_VERSION
-          default: '{engine-version}'
-          description: 'Development purposes only! Nordix Cloud Infra Engine version to use for deploying ONAP. Could be sha, branch'
-      - string:
-          name: ENGINE_REFSPEC
-          default: '{engine-refspec}'
-          description: 'Development purposes only! Nordix Cloud Infra Engine version to use for deploying ONAP. Must be refspec.'
-      - string:
-          name: DEPLOY_SCENARIO_VERSION
-          default: '{deploy-scenario-version}'
-          description: 'Development purposes only! Nordix Cloud Infra Scenario version to use for deploying ONAP. Depends on DEPLOY_SCENARIO_REFSPEC and could be sha, branch.'
-      - string:
-          name: DEPLOY_SCENARIO_REFSPEC
-          default: '{deploy-scenario-refspec}'
-          description: 'Development purposes only! Nordix Cloud Infra Scenario version to use for deploying ONAP. Depends on DEPLOY_SCENARIO_VERSION and must be refspec.'
       - string:
           name: XTESTING_REPO_URL
           default: 'https://gerrit.nordix.org/opnfv/xtesting-onap.git'
@@ -103,7 +63,7 @@
           !include-raw: ./onap-deploy.sh
 
 - builder:
-    name: 'oom-healthcheck-macro'
+    name: 'oom-hc-macro'
     builders:
       - shell:
           !include-raw: ./oom-healthcheck.sh
@@ -120,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: