X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-macros.yaml;h=0771a145b8938ef20b6a769ddcff8a9394b1b35f;hb=471df7d269a12631edac795371522802380306ee;hp=b05c4e3ad8c62688e727ab4757fa4268864daa48;hpb=9c661b6edf9d33fb07d998bf2440c0e92a43109e;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml
index b05c4e3a..0771a145 100644
--- a/jjb/cloud-infra/onap-macros.yaml
+++ b/jjb/cloud-infra/onap-macros.yaml
@@ -22,14 +22,6 @@
 - 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'
@@ -46,14 +38,18 @@
           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: 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'
@@ -62,10 +58,7 @@
           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:
@@ -75,7 +68,21 @@
           !include-raw: ./onap-deploy.sh
 
 - builder:
-    name: 'oom-healthcheck-macro'
+    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
@@ -86,6 +93,12 @@
       - 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: