X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=4af1d400e135dc0145643452b09904701c6a90cd;hb=fc0bd715212a172c15c143142f44af1fc029f9f2;hp=fd2a6b7fe7ac875e274057a2effbbaeb3e05e8d7;hpb=39b91e0029b36de00b546613b8cf0da33151d2a5;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index fd2a6b7f..4af1d400 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -60,7 +60,7 @@
           deploy-scenario-version: master
           deploy-scenario-refspec: master
           disabled: false
-          delete-stack: 'no'
+          delete-stack: 'yes'
 
     distro:
       - ubuntu1804
@@ -143,6 +143,9 @@
       - string:
           name: STACK_NAME
           default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
+      - string:
+          name: KEYPAIR_NAME
+          default: 'keypair-nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
       - string:
           name: HEAT_ENVIRONMENT_FILENAME
           default: "heat-environment-{cloud}-{distro}-full.yaml"
@@ -177,9 +180,13 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
             - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -214,7 +221,7 @@
           description: $DEPLOY_SCENARIO | $ONAP_FLAVOR
       - shell: |
           #!/bin/bash
-          sudo /bin/rm -rf /tmp/openrc && sudo /bin/cp -f $OPENRC_FILE /tmp/openrc
+          /bin/rm -rf /tmp/openrc && /bin/cp -f $OPENRC_FILE /tmp/openrc
       - multijob:
           name: Deploy ONAP using OOM
           condition: ALWAYS
@@ -232,6 +239,7 @@
                 ONAP_FLAVOR=$ONAP_FLAVOR
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -262,6 +270,7 @@
                 TEST_TYPE=oom-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -293,6 +302,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -319,6 +329,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -345,6 +356,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -371,6 +383,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -397,6 +410,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -427,6 +441,7 @@
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
@@ -495,7 +510,7 @@
           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_FILENAME"
+          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:
@@ -564,7 +579,7 @@
           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_FILENAME"
+          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