From 395f17a48813bd15525e4f1ff683ebe5468827b5 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 22 Aug 2019 21:09:59 +0000 Subject: [PATCH] Update clean-stack postbuild step Change-Id: I0a871576ecfc124756da5973c0d8dd98fc9f4c3c --- jjb/cloud-infra/cloud-infra-periodic-onap.yaml | 7 +++++++ jjb/cloud-infra/delete-heat-stack.sh | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml index 71209df0..7c7a0f7c 100644 --- 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: + - credentials-binding: + - file: + credential-id: nordix-jenkins-openrcfile-city-frankfurt-defaultproject + variable: OPENRC_FILE + - mask-passwords - build-timeout: timeout: 220 - fix-workspace-permissions @@ -331,6 +336,8 @@ - NOT_BUILT - UNSTABLE build-steps: + - shell: + !include-raw-escape: ./wait-for-pkg-manager.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 912fdfc0..34ed7ac9 100644 --- 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 +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 -sudo apt install -y python-virtualenv +sudo apt install -y python-dev python-virtualenv virtualenv $WORKSPACE/.venv set +u source $WORKSPACE/.venv/bin/activate -- 2.25.1