From af99e7eac1c20fe77a95d1f5755ff48a185733b1 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 22 Aug 2019 21:29:02 +0000 Subject: [PATCH] Source openrc file Change-Id: Ia033ddc4b85cd2578d658f5aeaa508c61120928c --- jjb/cloud-infra/cloud-infra-periodic-onap.yaml | 3 +++ jjb/cloud-infra/delete-heat-stack.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml index 7c7a0f7c..d5a720c4 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -159,6 +159,9 @@ builders: - description-setter: description: $INSTALLER_TYPE | $DEPLOY_SCENARIO + - shell: | + #!/bin/bash + cp $OPENRC_FILE /tmp/openrc - multijob: name: Deploy ONAP using OOM condition: SUCCESSFUL diff --git a/jjb/cloud-infra/delete-heat-stack.sh b/jjb/cloud-infra/delete-heat-stack.sh index 34ed7ac9..50a6396e 100644 --- a/jjb/cloud-infra/delete-heat-stack.sh +++ b/jjb/cloud-infra/delete-heat-stack.sh @@ -41,7 +41,7 @@ set -u pip install openstacksdk python-openstackclient python-heatclient echo "Info: Deleting stack $STACK_NAME" echo "-------------------------------------------------------------------------" -source $OPENRC_FILE +source /tmp/openrc && /bin/rm -f /tmp/openrc openstack stack delete $STACK_NAME --wait --yes echo "-------------------------------------------------------------------------" echo "Info: Stack $STACK_NAME has been deleted!" -- 2.25.1