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 85b5addb3a2a7fd0cb457aeec1615175f95a25ba..e2763b59e458acaa7326d4ed7658e94ab51de16d 100644 (file)
--- a/jjb/cloud-infra/onap-macros.yaml
+++ b/jjb/cloud-infra/onap-macros.yaml
@@ -19,6 +19,41 @@
 # ============LICENSE_END=========================================================
 
 # macros used by all job types
+- parameter:
+    name: 'onap-parameter-macro'
+    parameters:
+      - string:
+          name: PROVISIONER_TYPE
+          default: 'heat'
+          description: 'Provisioner to use for provisioning nodes'
+      - string:
+          name: INSTALLER_TYPE
+          default: 'kubespray'
+          description: 'Installer to use for deploying the scenario'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'onap-nofeature-noha'
+          description: 'Scenario to deploy and test'
+      - string:
+          name: DEPLOY_TYPE
+          default: 'cloud'
+          description: 'Type of the deployment'
+      - string:
+          name: TEST_TYPE
+          default: 'oom-healthcheck'
+          description: 'Test type to run. Could be oom-healthcheck or onap-healthcheck'
+      - string:
+          name: XTESTING_REPO_URL
+          default: 'https://gerrit.nordix.org/opnfv/xtesting-onap.git'
+          description: 'URL to Nordix xtesting-onap repository'
+      - string:
+          name: ENGINE_ANSIBLE_PARAMS
+          default: ''
+          description: 'Extra parameters that can be added when run the play books.'
+      - string:
+          name: CLEANUP
+          default: 'true'
+          description: 'Cleanup leftovers of the previous run'
 - builder:
     name: 'onap-deploy-macro'
     builders:
@@ -28,18 +63,14 @@
           !include-raw: ./onap-deploy.sh
 
 - builder:
-    name: 'oom-healthcheck-macro'
+    name: 'oom-hc-macro'
     builders:
-      - shell:
-          !include-raw: ./prepare-for-xtesting.sh
       - shell:
           !include-raw: ./oom-healthcheck.sh
 
 - builder:
     name: 'onap-healthcheck-macro'
     builders:
-      - shell:
-          !include-raw: ./prepare-for-xtesting.sh
       - shell:
           !include-raw: ./onap-healthcheck.sh