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: Set stack version to change revision
[infra/cicd.git]
/
jjb
/
engine
/
scripts
/
functest.sh
diff --git
a/jjb/engine/scripts/functest.sh
b/jjb/engine/scripts/functest.sh
index b43628f1e04c6e67760c998e423edcbddee0ee9a..dad8a32061450605eb2045fbfef0d4bc72abe252 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
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
# 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
/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
+42,11
@@
echo "Info : Cloning infra/test repository"
cd $HOME && /bin/rm -rf $WORKSPACE
git clone -q $TEST_REPO_URL $WORKSPACE
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
+export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/deployment/test/g')
+
cd $WORKSPACE/test
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: