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 654c419d06ee32646fa75f6349df98a916ddc858..14a2b0cb7d94537e721c1136fa3bddc368466081 100755 (executable)
--- a/jjb/engine/scripts/functest.sh
+++ b/jjb/engine/scripts/functest.sh
@@ -22,21 +22,27 @@ 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
 
 # NOTE (fdegir): delete unnecessary stuff to free up space on baremetal jumphost
-sudo /bin/rm -rf /tmp/$ARTIFACT_TO_DOWNLOAD \
-    /opt/test /opt/stack /httpboot /opt/engine/offline/binaries /opt/engine/offline/containers
-    /opt/engine/offline/dib /opt/engine/offline/pkg
-sudo docker images -a | grep -v CONTAINER | awk '{print $1":"$2}' | \
-    xargs -n 1 sudo docker rmi -f || true
+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
 
 echo "Info  : Cloning infra/test repository"
 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 -s $STACK_TYPE -y $YARDSTICK_DISPATCHER -d
+
+# vim: set ts=2 sw=2 expandtab: