Merge "Revert "cloud-infra: Use sudo while operating on openrc""

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-deploy.sh

diff --git a/jjb/cloud-infra/cloud-infra-deploy.sh b/jjb/cloud-infra/cloud-infra-deploy.sh
index 71062a699e91be57d22efa1cbfd22fc6836f56fb..091a6d6fa5877933f37833f9334d95d1d6bc4b3d 100644 (file)
--- 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 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!"
-  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"