Update clean-stack postbuild step

Change-Id: I0a871576ecfc124756da5973c0d8dd98fc9f4c3c

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 71209df05af8f1b727dbba50ce48404f69bd2113..7c7a0f7c1b49c990e41f3b120cf3cb4ca024f4dd 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -137,6 +137,11 @@
           option: project
 
     wrappers:
           option: project
 
     wrappers:

+      - credentials-binding:
+          - file:
+              credential-id: nordix-jenkins-openrcfile-city-frankfurt-defaultproject
+              variable: OPENRC_FILE
+      - mask-passwords

       - build-timeout:
           timeout: 220
       - fix-workspace-permissions
       - build-timeout:
           timeout: 220
       - fix-workspace-permissions


@@ -331,6 +336,8 @@
                 - NOT_BUILT
                 - UNSTABLE
               build-steps:
                 - NOT_BUILT
                 - UNSTABLE
               build-steps:

+                - shell:
+                    !include-raw-escape: ./wait-for-pkg-manager.sh

                 - shell:
                     !include-raw: ./delete-heat-stack.sh
 
                 - shell:
                     !include-raw: ./delete-heat-stack.sh
 

diff --git a/jjb/cloud-infra/delete-heat-stack.sh b/jjb/cloud-infra/delete-heat-stack.sh
index 912fdfc05808c014b1a92556609b5b85225c3303..34ed7ac96bf1ecebbe4aac5ff8f795e9541de4e8 100644 (file)
--- a/jjb/cloud-infra/delete-heat-stack.sh
+++ b/jjb/cloud-infra/delete-heat-stack.sh
@@ -21,11 +21,19 @@
 set -o errexit
 set -o nounset
 
 set -o errexit
 set -o nounset
 

+echo
+echo
+echo "-------------------------------------------------------------------------"
+echo "Info: Please wait while deleting the stack and do not abort the job!"
+echo "-------------------------------------------------------------------------"
+echo
+echo
+

 # stack name to delete
 export STACK_NAME=nordix-onap-custom
 
 cd $WORKSPACE
 # stack name to delete
 export STACK_NAME=nordix-onap-custom
 
 cd $WORKSPACE

-sudo apt install -y python-virtualenv
+sudo apt install -y python-dev python-virtualenv

 virtualenv $WORKSPACE/.venv
 set +u
 source $WORKSPACE/.venv/bin/activate
 virtualenv $WORKSPACE/.venv
 set +u
 source $WORKSPACE/.venv/bin/activate