Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
engine: Adapt verify jobs for infra/installer/kolla repository
[infra/cicd.git]
/
jjb
/
engine
/
scripts
/
functest.sh
diff --git
a/jjb/engine/scripts/functest.sh
b/jjb/engine/scripts/functest.sh
index 8799ce931439ec74c2c6052581369a2a86eb28c7..b43628f1e04c6e67760c998e423edcbddee0ee9a 100755
(executable)
--- a/
jjb/engine/scripts/functest.sh
+++ b/
jjb/engine/scripts/functest.sh
@@
-22,15
+22,26
@@
set -o nounset
set -o errexit
set -o pipefail
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 [[ "$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 \
# 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/
containers
\
- /
opt/engine/offline/dib /opt/engine/offline/pkg /
tmp/kubespray_cache > /dev/null 2>&1 || true
+ /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"
sudo docker images -a --format {{.ID}} | xargs -n 1 sudo docker rmi -f > /dev/null 2>&1 || true
echo "Info : Cloning infra/test repository"
@@
-38,4
+49,4
@@
cd $HOME && /bin/rm -rf $WORKSPACE
git clone -q $TEST_REPO_URL $WORKSPACE
cd $WORKSPACE/test
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