From: Fatih Degirmenci <fdegir@gmail.com>
Date: Fri, 29 Nov 2019 06:05:38 +0000 (+0100)
Subject: cloud-infra: Be more explicit while determining to verify scenarios
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F3023%2F2;p=infra%2Fcicd.git

cloud-infra: Be more explicit while determining to verify scenarios

Change-Id: If1622980918a46847c8b238c1b41cc4cf27a0732
---

diff --git a/jjb/cloud-infra/cloud-infra-deploy.sh b/jjb/cloud-infra/cloud-infra-deploy.sh
index eecb1878..091a6d6f 100644
--- a/jjb/cloud-infra/cloud-infra-deploy.sh
+++ b/jjb/cloud-infra/cloud-infra-deploy.sh
@@ -37,18 +37,27 @@ set -o pipefail
 #   If DEPLOY_TYPE is baremetal, we use variable NODE_NAME injected by Jenkins to the job
 #     in order to set PDF and IDF for the POD the job is running against.
 
-# we don't support ONAP scenario verification because it is expensive
-# TODO: we need to find a way to verify those patches in a cheaper way
-if [[ "$DEPLOY_SCENARIO" =~ "onap-" ]]; then
-  echo "Info: ONAP scenario verification has not been implemented yet!"
-  exit 0
-fi
+# be more explicit while determining if we support verification of the given scenario
+case $DEPLOY_SCENARIO in
+  onap*)
+    echo "Info: $DEPLOY_SCENARIO scenario verification has not been implemented yet!"
+    exit 0
+    ;;
+  os*|armada*)
+    if [[ "$PROVISIONER_TYPE" != "bifrost" ]]; then
+      echo "Info: $DEPLOY_SCENARIO scenario verification is only available with the provisioner bifrost"
+      exit 0
+    fi
+    ;;
+  k8*)
+    ;;
+  *)
+    echo "Error: Scenario $DEPLOY_SCENARIO is not supported!"
+    exit 1
+    ;;
+esac
 
-# 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
+echo "Info: Proceeding with $DEPLOY_SCENARIO scenario using provisioner $PROVISIONER_TYPE"
 
 if [[ $DEPLOY_TYPE == "baremetal" ]]; then
   PDF="https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/${NODE_NAME}-pdf.yml"