From 55d5b81cb078f11e44827575c7e94cdb7a680db7 Mon Sep 17 00:00:00 2001 From: Sriram Yagnaraman Date: Tue, 22 Oct 2019 11:55:25 +0200 Subject: [PATCH] Avoid deleting stack for unsupported OS on OS deployments. Openstack on heat provisioner is not supported. So there is no stack to delete, so just quit gracefully. Also increasing job timeout for functest to 60 mins, as openstack functest-healthcheck takes more than 30 mins now. installer-type: kolla deploy-scenario: os-nosdn-nofeature Change-Id: I1d0640a0d0f615df2af206a163daa736fd084a4d --- jjb/cloud-infra/cloud-infra-verify-engine.yaml | 2 +- jjb/cloud-infra/delete-heat-stack.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml index b6e58970..21c46550 100644 --- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml +++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml @@ -80,7 +80,7 @@ - deploy: build-timeout: 90 - functest: - build-timeout: 30 + build-timeout: 60 jobs: - 'cloud-infra-verify-engine-{distro}-{cloud}-{type}-{stream}' diff --git a/jjb/cloud-infra/delete-heat-stack.sh b/jjb/cloud-infra/delete-heat-stack.sh index 2bd6c732..b3239445 100644 --- a/jjb/cloud-infra/delete-heat-stack.sh +++ b/jjb/cloud-infra/delete-heat-stack.sh @@ -29,6 +29,14 @@ if [[ $DEPLOY_TYPE != "cloud" ]]; then exit 0 fi +# we don't support OpenStack scenario verification on OpenStack yet +if [[ "$DEPLOY_SCENARIO" =~ "os-" ]] && [[ "$PROVISIONER_TYPE" == "heat" ]]; then + echo "-------------------------------------------------------------------------" + echo "Info: OpenStack scenario verification on OpenStack has not been implemented yet!" + echo "-------------------------------------------------------------------------" + exit 0 +fi + if [[ "$DELETE_STACK" != "yes" ]]; then echo "-------------------------------------------------------------------------" echo "Info: Stack will not be deleted upon the completion of the job!" -- 2.25.1