X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-deploy.sh;h=29854372ffe19b86fb26b82de93519fd0f526167;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=eecb1878e944a7bad820d5c9db80d3ecd61d9140;hpb=2fc1c774cc2972caaf6ca0bff7cc8aa7f01b3e95;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-deploy.sh b/jjb/cloud-infra/cloud-infra-deploy.sh
index eecb1878..29854372 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"
@@ -59,9 +68,9 @@ else
 fi
 
 if [[ $PROVISIONER_TYPE == "bifrost" ]]; then
-  DEPLOY_CMD="./engine/deploy.sh -c -r $PROVISIONER_TYPE -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -p $PDF -i $IDF"
+  DEPLOY_CMD="./engine/deploy.sh -r $PROVISIONER_TYPE -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -p $PDF -i $IDF"
 elif [[ $PROVISIONER_TYPE == "heat" ]]; then
-  DEPLOY_CMD="./engine/deploy.sh -c -r $PROVISIONER_TYPE -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -u /tmp/openrc -e $HEAT_ENVIRONMENT_FILE"
+  DEPLOY_CMD="./engine/deploy.sh -r $PROVISIONER_TYPE -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -u /tmp/openrc -e $HEAT_ENVIRONMENT_FILE"
 else
   echo "Error: Unsupported provisioner type. Must either be bifrost or heat!"
   exit 1