X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fscripts%2Ffunctest.sh;h=d98ad0aff0777211e5e437612a114fe03fae291c;hb=24eaec5b71aa5f80e147731d7204c86f0dbd4a2b;hp=b43628f1e04c6e67760c998e423edcbddee0ee9a;hpb=5410f0f440f1c6c724fc99bd907b6f91c0a82032;p=infra%2Fcicd.git

diff --git a/jjb/engine/scripts/functest.sh b/jjb/engine/scripts/functest.sh
index b43628f1..d98ad0af 100755
--- a/jjb/engine/scripts/functest.sh
+++ b/jjb/engine/scripts/functest.sh
@@ -18,7 +18,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 
-set -o nounset
 set -o errexit
 set -o pipefail
 
@@ -32,14 +31,8 @@ if [[ "$EXECUTION_MODE" == "offline-deployment" && "$SLAVE_LABEL" != "baremetal-
   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 \
+sudo /bin/rm -rf /tmp/$BUILD_ARTIFACTS ~/.ara \
     /opt/test /opt/stack /httpboot /opt/engine/offline/binaries /opt/engine/offline/dib \
     /tmp/kubespray_cache > /dev/null 2>&1 || true
 sudo docker images -a --format {{.ID}} | xargs -n 1 sudo docker rmi -f > /dev/null 2>&1 || true
@@ -48,5 +41,15 @@ echo "Info  : Cloning infra/test repository"
 cd $HOME && /bin/rm -rf $WORKSPACE
 git clone -q $TEST_REPO_URL $WORKSPACE
 
+# NOTE (fdegir): we need to override execution mode variable coming from change.properties file
+if [[ "$CI_LOOP" != "release" ]]; then
+  export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/deployment/test/g')
+else
+  export EXECUTION_MODE=online-test
+fi
+
 cd $WORKSPACE/test
-./test.sh -f $TEST_FW -t $TEST_SUITE -i $INSTALLER_TYPE -s $DEPLOY_SCENARIO -d $YARDSTICK_DISPATCHER
+./test.sh -s "$STACK_TYPE" -b "$BRANCH" -c "$DEPLOY_SCENARIO" -f "$TEST_FW" -t "$TEST_SUITE" \
+    -o /tmp/openrc -i /tmp/inventory.ini -y "$YARDSTICK_DISPATCHER" -v
+
+# vim: set ts=2 sw=2 expandtab: