From 2fc1c774cc2972caaf6ca0bff7cc8aa7f01b3e95 Mon Sep 17 00:00:00 2001 From: Sriram Yagnaraman Date: Mon, 25 Nov 2019 20:29:46 +0000 Subject: [PATCH] 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 --- jjb/cloud-infra/cloud-infra-deploy.sh | 6 +++--- jjb/cloud-infra/delete-heat-stack.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jjb/cloud-infra/cloud-infra-deploy.sh b/jjb/cloud-infra/cloud-infra-deploy.sh index 71062a69..eecb1878 100644 --- 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 b3239445..872ba304 100644 --- 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 -- 2.25.1