From 5cae070a7ed8d8836dfc7fd5991126a67d7c27bd Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 28 Sep 2015 12:39:50 +0000 Subject: testing_trigger: modify for multi-testing changes --- triggers/testing_trigger.sh | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/triggers/testing_trigger.sh b/triggers/testing_trigger.sh index ab22926..141e57b 100644 --- a/triggers/testing_trigger.sh +++ b/triggers/testing_trigger.sh @@ -2,14 +2,7 @@ set -ex ARTEFACT=$1 TESTING_SHA=$2 echo "[$(date "+%F %R")] Testing triggered. Artefact: $1" >> ../../../../trigger_log -sudo chown $USER /archive/tlsa-ciat-test-x86_64.raw -chmod 644 /archive/tlsa-ciat-test-x86_64.raw -### First you need to source the environment for openstack deployment. -### This isn't commited because it contains password, etc. -set +x -source /archive/tlsa/os.setup -set -x ### Now you can run the tester: @@ -20,10 +13,25 @@ cd /archive/testing if [ -d ciat-tester ]; then sudo rm -rf ciat-tester fi -git clone ssh://git@cu010-trove.codethink.com/cu010-trove/br6/ciat-tester +git clone -b pedroalvarez/multi-testing ssh://git@cu010-trove.codethink.com/cu010-trove/br6/ciat-tester cd ciat-tester if [ "$TESTING_SHA" != "no_testing_sha_given" ]; then git checkout $TESTING_SHA fi PATH=$PATH:/usr/local/bin -./test-runner.sh file:///archive/"$ARTEFACT".raw openstack tests/python.test tests/uname.test tests/systemd.test tests/baserock-meta.test + +### Copy systems.setup with info of the systems to test, +### openstack.setup to get OpenStack host details +### and multiple.test with the tests to run +### (This shouldn't be hardcoded here) +cp /archive/pedroalvarez/system.setup system.setup +cp /archive/pedroalvarez/openstack.setup openstack.setup +cp /archive/pedroalvarez/multiple.test multiple.test + + +### Change the URL of system.setup to point to ARTEFACT +sed -i -e 's/IMAGE/$ARTEFACT/g' system.setup + +### Run the tester. +### (These files shouldn't be hardcoded) +python -u tester --setup system.setup /archive/pedroalvarez/tests/multiple.test -- cgit v1.2.1