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

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index b6e58970c4cc4ab447f64af697aa039e1a3c0ee3..21c46550880e526aa7c4496b858e7b50b30e1d93 100644 (file)
--- 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 2bd6c732a10675b8a1ba947b78b728d2279506fb..b3239445c1461a2a9381344a81804cdb2e362fb4 100644 (file)
--- 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!"