X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-macros.yaml;h=55b92c97177639728bc344265c41962e246c19e8;hb=refs%2Fchanges%2F69%2F4169%2F8;hp=7cfac2e7a1d6755cd359451e94f41b032189bc4b;hpb=0a2e213dc932ba328e4b9ce8c40a8cef93f91e5f;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml
index 7cfac2e7..55b92c97 100644
--- a/jjb/cloud-infra/onap-macros.yaml
+++ b/jjb/cloud-infra/onap-macros.yaml
@@ -18,7 +18,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 
-# macros used by all job types
+# macros used by all job types on cloud
 - parameter:
     name: 'onap-parameter-macro'
     parameters:
@@ -59,6 +59,47 @@
           default: ''
           description: 'Extra parameters that can be added when run the play books.'
 
+# macros used by all job types on baremetal
+- parameter:
+    name: 'onap-baremetal-parameter-macro'
+    parameters:
+      - string:
+          name: PROVISIONER_TYPE
+          default: 'bifrost'
+          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: 'baremetal'
+          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: NORDIX_ARM_REPO_URL
+          default: 'https://artifactory.nordix.org/artifactory'
+          description: 'URL to Nordix Artifactory'
+      - string:
+          name: NORDIX_HARBOR_REPO_URL
+          default: 'registry.nordix.org'
+          description: 'URL to Nordix Harbor'
+      - 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.'
+
 - builder:
     name: 'onap-deploy-macro'
     builders:
@@ -67,18 +108,38 @@
       - shell:
           !include-raw: ./onap-deploy.sh
 
+- builder:
+    name: 'onap-deploy-baremetal-macro'
+    builders:
+      - shell:
+          !include-raw: ./wait-for-pkg-manager.sh
+      - shell:
+          !include-raw: ./onap-deploy-baremetal.sh
+
 - builder:
     name: 'oom-hc-macro'
     builders:
       - shell:
           !include-raw: ./oom-healthcheck.sh
 
+- builder:
+    name: 'oom-hc-baremetal-macro'
+    builders:
+      - shell:
+          !include-raw: ./oom-healthcheck.sh
+
 - builder:
     name: 'onap-healthcheck-macro'
     builders:
       - shell:
           !include-raw: ./onap-healthcheck.sh
 
+- builder:
+    name: 'onap-healthcheck-baremetal-macro'
+    builders:
+      - shell:
+          !include-raw: ./onap-healthcheck.sh
+
 - builder:
     name: 'promote-onap-macro'
     builders: