summaryrefslogtreecommitdiff
path: root/triggers
diff options
context:
space:
mode:
Diffstat (limited to 'triggers')
-rw-r--r--triggers/deploy_trigger.sh8
-rw-r--r--triggers/testing_trigger.sh5
2 files changed, 8 insertions, 5 deletions
diff --git a/triggers/deploy_trigger.sh b/triggers/deploy_trigger.sh
index fc4b1bb..e4c3741 100644
--- a/triggers/deploy_trigger.sh
+++ b/triggers/deploy_trigger.sh
@@ -1,4 +1,6 @@
set -ex
-echo "[$(date "+%F %R")] Deploy triggered with system $1." >> ../../../../trigger_log
-sed "s/BUILDNUMBER/$2/" tlsa.morph > definitions/clusters/tlsa.morph
-python deploy_logic.py $1
+SYSTEM=$1
+BUILDNUMBER=$2
+echo "[$(date "+%F %R")] Deploy triggered with system $SYSTEM." >> ../../../../trigger_log
+sed "s/BUILDNUMBER/$BUILDNUMBER/" tlsa.morph > definitions/clusters/tlsa.morph
+python deploy_logic.py $SYSTEM $BUILDNUMBER
diff --git a/triggers/testing_trigger.sh b/triggers/testing_trigger.sh
index 359d59e..686b1e9 100644
--- a/triggers/testing_trigger.sh
+++ b/triggers/testing_trigger.sh
@@ -1,5 +1,6 @@
set -ex
-echo "[$(date "+%F %R")] Automated testing triggered." >> ../../../../trigger_log
+DEPLOY_BUILDNUMBER=$1
+echo "[$(date "+%F %R")] Automated testing triggered. Deploy buildnumber: $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.
@@ -20,4 +21,4 @@ if [ -d ciat-tester ]; then
fi
git clone ssh://git@cu010-trove.codethink.com/cu010-trove/br6/ciat-tester
cd ciat-tester
-./test-runner.sh file:///archive/tlsa-ciat-test-x86_64.raw openstack tests/python.test tests/uname.test
+./test-runner.sh file:///archive/tlsa-ciat-test-x86_64_"$DEPLOY_BUILDNUMBER".raw openstack tests/python.test tests/uname.test