Adapt test jobs to stack oriented framework

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

diff --git a/jjb/engine/scripts/functest.sh b/jjb/engine/scripts/functest.sh
index b43628f1e04c6e67760c998e423edcbddee0ee9a..14a2b0cb7d94537e721c1136fa3bddc368466081 100755 (executable)
--- a/jjb/engine/scripts/functest.sh
+++ b/jjb/engine/scripts/functest.sh
@@ -32,14 +32,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
@@ -49,4 +43,6 @@ cd $HOME && /bin/rm -rf $WORKSPACE
 git clone -q $TEST_REPO_URL $WORKSPACE
 
 cd $WORKSPACE/test
-./test.sh -f $TEST_FW -t $TEST_SUITE -i $INSTALLER_TYPE -s $DEPLOY_SCENARIO -d $YARDSTICK_DISPATCHER
+./test.sh -f $TEST_FW -t $TEST_SUITE -s $STACK_TYPE -y $YARDSTICK_DISPATCHER -d
+
+# vim: set ts=2 sw=2 expandtab: