Armada: Skip armada scenario deployment on cloud

Currently we support only pure k8s scenarios on cloud.
Everything else shall be skipped for DEPLOY_TYPE == cloud

Change-Id: I5eb536d82066cd476c89db9dad27e812534f130b

diff --git a/jjb/cloud-infra/cloud-infra-deploy.sh b/jjb/cloud-infra/cloud-infra-deploy.sh
index 71062a699e91be57d22efa1cbfd22fc6836f56fb..eecb1878e944a7bad820d5c9db80d3ecd61d9140 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-deploy.sh
+++ b/jjb/cloud-infra/cloud-infra-deploy.sh
@@ -44,9 +44,9 @@ if [[ "$DEPLOY_SCENARIO" =~ "onap-" ]]; then
   exit 0
 fi
 
-# we don't support OpenStack scenario verification on OpenStack yet
-if [[ "$DEPLOY_SCENARIO" =~ "os-" ]] && [[ "$PROVISIONER_TYPE" == "heat" ]]; then
-  echo "Info: OpenStack scenario verification on OpenStack has not been implemented yet!"
+# we only support k8s scenario deployment on openstack as of now
+if [[ "$DEPLOY_SCENARIO" != "k8-*" ]] && [[ "$PROVISIONER_TYPE" == "heat" ]]; then
+  echo "Info: Only k8s scenario verification on OpenStack has been implemented!"
   exit 0
 fi
 

diff --git a/jjb/cloud-infra/delete-heat-stack.sh b/jjb/cloud-infra/delete-heat-stack.sh
index b3239445c1461a2a9381344a81804cdb2e362fb4..872ba304d9d67f82da1cc5c38959aa73debe5453 100644 (file)
--- a/jjb/cloud-infra/delete-heat-stack.sh
+++ b/jjb/cloud-infra/delete-heat-stack.sh
@@ -29,10 +29,10 @@ 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
+# we only support k8s scenario deployment on openstack as of now
+if [[ "$DEPLOY_SCENARIO" != "k8-*" ]] && [[ "$PROVISIONER_TYPE" == "heat" ]]; then
   echo "-------------------------------------------------------------------------"
-  echo "Info: OpenStack scenario verification on OpenStack has not been implemented yet!"
+  echo "Info: Only k8s scenario deployment on OpenStack has been implemented!"
   echo "-------------------------------------------------------------------------"
   exit 0
 fi