Merge "ONAP: Adding Jenkins jobs for oparent repo"

[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 fd9f6a41d42b5f154f17bb6130b9c66cb5c1ae6e..71062a699e91be57d22efa1cbfd22fc6836f56fb 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-deploy.sh
+++ b/jjb/cloud-infra/cloud-infra-deploy.sh
@@ -39,11 +39,17 @@ set -o pipefail
 
 # 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
+if [[ "$DEPLOY_SCENARIO" =~ "onap-" ]]; then
   echo "Info: ONAP scenario verification has not been implemented yet!"
   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!"
+  exit 0
+fi
+
 if [[ $DEPLOY_TYPE == "baremetal" ]]; then
   PDF="https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/${NODE_NAME}-pdf.yml"
   IDF="https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/${NODE_NAME}-idf.yml"
@@ -55,7 +61,7 @@ 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"
 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"
+  DEPLOY_CMD="./engine/deploy.sh -c -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