X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-macros.yaml;h=8129201e9ed675e4f741e9bd6ec0d08d2326d590;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=192321208d6de00c82ffc628d17f608e2d501170;hpb=76c4bd93acb50e0930829a07b43ed20797766076;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml
index 19232120..8129201e 100644
--- a/jjb/cloud-infra/onap-macros.yaml
+++ b/jjb/cloud-infra/onap-macros.yaml
@@ -18,18 +18,10 @@
 # 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'
+    name: 'onap-parameter-macro-legacy'
     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'
@@ -50,6 +42,14 @@
           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'
@@ -58,12 +58,50 @@
           name: ENGINE_ANSIBLE_PARAMS
           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-legacy'
+    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: CLEANUP
-          default: 'true'
-          description: 'Cleanup leftovers of the previous run'
+          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'
+    name: 'onap-deploy-macro-legacy'
     builders:
       - shell:
           !include-raw: ./wait-for-pkg-manager.sh
@@ -71,19 +109,39 @@
           !include-raw: ./onap-deploy.sh
 
 - builder:
-    name: 'oom-hc-macro'
+    name: 'onap-deploy-baremetal-macro-legacy'
+    builders:
+      - shell:
+          !include-raw: ./wait-for-pkg-manager.sh
+      - shell:
+          !include-raw: ./onap-deploy-baremetal.sh
+
+- builder:
+    name: 'oom-hc-macro-legacy'
+    builders:
+      - shell:
+          !include-raw: ./oom-healthcheck.sh
+
+- builder:
+    name: 'oom-hc-baremetal-macro-legacy'
     builders:
       - shell:
           !include-raw: ./oom-healthcheck.sh
 
 - builder:
-    name: 'onap-healthcheck-macro'
+    name: 'onap-healthcheck-macro-legacy'
+    builders:
+      - shell:
+          !include-raw: ./onap-healthcheck.sh
+
+- builder:
+    name: 'onap-healthcheck-baremetal-macro-legacy'
     builders:
       - shell:
           !include-raw: ./onap-healthcheck.sh
 
 - builder:
-    name: 'promote-onap-macro'
+    name: 'promote-onap-macro-legacy'
     builders:
       - shell:
           !include-raw: ./promote-onap.sh