X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-macros.yaml;h=b05c4e3ad8c62688e727ab4757fa4268864daa48;hb=7b7da37cfe6e637880869a954692774d55145fb3;hp=85b5addb3a2a7fd0cb457aeec1615175f95a25ba;hpb=aadea7b744bfd18a2944ea079155f311edc58e39;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml
index 85b5addb..b05c4e3a 100644
--- a/jjb/cloud-infra/onap-macros.yaml
+++ b/jjb/cloud-infra/onap-macros.yaml
@@ -19,6 +19,53 @@
 # ============LICENSE_END=========================================================
 
 # macros used by all job types
+- 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'
+          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: 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: 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:
@@ -30,16 +77,12 @@
 - builder:
     name: 'oom-healthcheck-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