Create separate macros for ONAP baremetal jobs

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-periodic-onap-baremetal.yaml

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml
index f3eef6d5ff29d55d0906f5b513b0934d86080664..646888022751d158808480ff760ddecb8c4b3438 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml
@@ -67,8 +67,8 @@
       - oom-hc:
           build-timeout: 30
           test-type: oom-healthcheck
-      - promote-onap:
-          build-timeout: 240
+#      - promote-onap:
+#          build-timeout: 240
 
     onap-healthcheck-phases:
       - onap-hc-core:
@@ -181,7 +181,7 @@
 
     builders:
       - description-setter:
-          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR
+          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | baremetal
       - multijob:
           name: Deploy ONAP using OOM
           condition: ALWAYS
@@ -436,8 +436,8 @@
 
     builders:
       - description-setter:
-          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER
-      - '{onap-other-phases}-macro'
+          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | baremetal
+      - '{onap-other-phases}-baremetal-macro'
 
 - job-template:
     name: '{onap-healthcheck-phases}-{distro}-{installer-type}-baremetal-{ci-loop}-{onap-branch}'
@@ -516,7 +516,7 @@
 
     builders:
       - description-setter:
-          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER
-      - 'onap-healthcheck-macro'
+          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | baremetal
+      - 'onap-healthcheck-baremetal-macro'
 
 # vim: set ts=2 sw=2 expandtab: