Merge "Revert "GEODE Update branch to: release-nordix/1.11.0""

[infra/cicd.git] / jjb / engine / scripts / functest.sh

diff --git a/jjb/engine/scripts/functest.sh b/jjb/engine/scripts/functest.sh
index e942011258dd40eccbe5f48d6ab7fb293d64dd35..b43628f1e04c6e67760c998e423edcbddee0ee9a 100755 (executable)
--- a/jjb/engine/scripts/functest.sh
+++ b/jjb/engine/scripts/functest.sh
@@ -22,11 +22,22 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
+if [[ "$EXECUTION_MODE" == "offline-deployment" && "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then
+  echo "Info  : Offline testing are not supported for $GERRIT_PROJECT"
+  exit 0
+fi
+
 if [[ "$EXECUTION_MODE" == "offline-deployment" && "$SLAVE_LABEL" != "baremetal-deploy" ]]; then
   echo "Info  : Testing of offline deployments is not currently supported!"
   exit 0
 fi
 
+if [[ "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then
+  echo "Info  : Setting installer to kolla and scenario to os-nosdn-nofeature"
+  export INSTALLER_TYPE="kolla"
+  export DEPLOY_SCENARIO="os-nosdn-nofeature"
+fi
+
 # NOTE (fdegir): delete unnecessary stuff to free up space on baremetal jumphost
 sudo /bin/rm -rf /tmp/$ARTIFACT_TO_DOWNLOAD ~/.ara \
     /opt/test /opt/stack /httpboot /opt/engine/offline/binaries /opt/engine/offline/dib \
@@ -38,4 +49,4 @@ cd $HOME && /bin/rm -rf $WORKSPACE
 git clone -q $TEST_REPO_URL $WORKSPACE
 
 cd $WORKSPACE/test
-./test.sh -f $TEST_FW -t $TEST_SUITE -s $DEPLOY_SCENARIO -d $YARDSTICK_DISPATCHER
+./test.sh -f $TEST_FW -t $TEST_SUITE -i $INSTALLER_TYPE -s $DEPLOY_SCENARIO -d $YARDSTICK_DISPATCHER