X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap-baremetal.yaml;h=7a50292a0a9747f05bee50da5b286d1f7687bbf0;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=646888022751d158808480ff760ddecb8c4b3438;hpb=471df7d269a12631edac795371522802380306ee;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml
index 64688802..7a50292a 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml
@@ -34,7 +34,7 @@
           onap-version: elalto
           onap-flavor: full
           engine-version: master
-          engine-refspec: 'refs/changes/57/4157/2'
+          engine-refspec: 'refs/changes/57/4157/12'
           deploy-scenario: 'onap-nofeature-noha'
           deploy-scenario-version: master
           deploy-scenario-refspec: master
@@ -44,7 +44,7 @@
           onap-version: master
           onap-flavor: full
           engine-version: master
-          engine-refspec: master
+          engine-refspec: 'refs/changes/57/4157/12'
           deploy-scenario: 'onap-nofeature-noha'
           deploy-scenario-version: master
           deploy-scenario-refspec: master
@@ -63,7 +63,7 @@
 
     onap-other-phases:
       - onap-deploy:
-          build-timeout: 210
+          build-timeout: 420
       - oom-hc:
           build-timeout: 30
           test-type: oom-healthcheck
@@ -106,7 +106,7 @@
           project: '{project}'
           branch: '{nordix-branch}'
       - nordix-gerrit-parameters
-      - onap-parameter-macro
+      - onap-baremetal-parameter-macro-legacy
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
@@ -265,7 +265,7 @@
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 ONAP_VERSION=$ONAP_VERSION
-                ONAP_FLAVOR=core
+                ONAP_FLAVOR=small
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 ENGINE_VERSION=$ENGINE_VERSION
@@ -286,7 +286,7 @@
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 ONAP_VERSION=$ONAP_VERSION
-                ONAP_FLAVOR=core
+                ONAP_FLAVOR=medium
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 ENGINE_VERSION=$ENGINE_VERSION
@@ -307,7 +307,7 @@
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 ONAP_VERSION=$ONAP_VERSION
-                ONAP_FLAVOR=core
+                ONAP_FLAVOR=full
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 ENGINE_VERSION=$ENGINE_VERSION
@@ -328,7 +328,7 @@
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 ONAP_VERSION=$ONAP_VERSION
-                ONAP_FLAVOR=core
+                ONAP_FLAVOR=healthdist
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 ENGINE_VERSION=$ENGINE_VERSION
@@ -381,15 +381,11 @@
           project: '{project}'
           branch: '{nordix-branch}'
       - nordix-gerrit-parameters
-      - onap-parameter-macro
+      - onap-baremetal-parameter-macro-legacy
       - label:
           name: SLAVE_LABEL
           default: 'xerces-jumphost-onap-ubuntu1804'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
-      - string:
-          name: OPENSTACK_CLOUD_PROVIDER
-          default: 'city'
-          description: 'Name of the cloud where this job is run'
       - string:
           name: DISTRO
           default: 'ubuntu1804'
@@ -402,14 +398,6 @@
           name: ONAP_VERSION
           default: '{onap-version}'
           description: 'ONAP version to deploy'
-      - string:
-          name: HEAT_ENVIRONMENT_FILENAME
-          default: "heat-environment-full.yaml"
-          description: 'Type of the deployment'
-      - string:
-          name: HEAT_ENVIRONMENT_FILE
-          default: "file:///opt/engine/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
-          description: 'Type of the deployment'
 
     wrappers:
       - mask-passwords
@@ -437,7 +425,7 @@
     builders:
       - description-setter:
           description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | baremetal
-      - '{onap-other-phases}-baremetal-macro'
+      - '{onap-other-phases}-baremetal-macro-legacy'
 
 - job-template:
     name: '{onap-healthcheck-phases}-{distro}-{installer-type}-baremetal-{ci-loop}-{onap-branch}'
@@ -454,15 +442,11 @@
           project: '{project}'
           branch: '{nordix-branch}'
       - nordix-gerrit-parameters
-      - onap-parameter-macro
+      - onap-baremetal-parameter-macro-legacy
       - label:
           name: SLAVE_LABEL
           default: 'xerces-jumphost-onap-ubuntu1804'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
-      - string:
-          name: OPENSTACK_CLOUD_PROVIDER
-          default: 'city'
-          description: 'Name of the cloud where this job is run'
       - string:
           name: DISTRO
           default: 'ubuntu1804'
@@ -471,14 +455,6 @@
           name: ONAP_VERSION
           default: '{onap-version}'
           description: 'ONAP version to deploy'
-      - string:
-          name: HEAT_ENVIRONMENT_FILENAME
-          default: "heat-environment-full.yaml"
-          description: 'Type of the deployment'
-      - string:
-          name: HEAT_ENVIRONMENT_FILE
-          default: "file:///opt/engine/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
-          description: 'Type of the deployment'
       - string:
           name: ENGINE_VERSION
           default: '{engine-version}'
@@ -517,6 +493,6 @@
     builders:
       - description-setter:
           description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | baremetal
-      - 'onap-healthcheck-baremetal-macro'
+      - 'onap-healthcheck-baremetal-macro-legacy'
 
 # vim: set ts=2 sw=2 expandtab: