diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-16 11:32:38 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-16 12:07:56 +0100 |
| commit | 2ac17e982075bba16a14cd5cdb154650a5ba9a58 (patch) | |
| tree | fd81ffbbf68e2af41598e92549d79ea60a2cf0b5 /triggers | |
| parent | 6aa25893eef26ed3dc4101374f5d8112ab406eb9 (diff) | |
| download | buildslave-scripts-2ac17e982075bba16a14cd5cdb154650a5ba9a58.tar.gz | |
Pass SHAs of state when build starts forwards
The SHAs of definitions, buildslave-scripts and ciat-testing are passed along
the pipeline for consistency
Diffstat (limited to 'triggers')
| -rw-r--r-- | triggers/deploy_trigger.sh | 9 | ||||
| -rw-r--r-- | triggers/testing_trigger.sh | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/triggers/deploy_trigger.sh b/triggers/deploy_trigger.sh index b4d5ebd..20c72e8 100644 --- a/triggers/deploy_trigger.sh +++ b/triggers/deploy_trigger.sh @@ -1,7 +1,14 @@ set -ex SYSTEM=$1 BUILDNUMBER=$2 +BUILDSLAVE_SCRIPTS_SHA=$3 +DEFINITIONS_SHA=$4 +TESTING_SHA=$5 ARTEFACT="tlsa-ciat-test-x86_64_$BUILDNUMBER" echo "[$(date "+%F %R")] Deploy triggered with system $SYSTEM." >> ../../../../trigger_log sed "s/ARTEFACT/$ARTEFACT/" tlsa.morph > definitions/clusters/tlsa.morph -python deploy_logic.py $SYSTEM $ARTEFACT +git checkout $BUILDSLAVE_SCRIPTS_SHA +cd definitions +git checkout $DEFINITIONS_SHA +cd .. +python deploy_logic.py $SYSTEM $ARTEFACT $TESING_SHA diff --git a/triggers/testing_trigger.sh b/triggers/testing_trigger.sh index 7a86e73..72ca9ed 100644 --- a/triggers/testing_trigger.sh +++ b/triggers/testing_trigger.sh @@ -1,5 +1,6 @@ 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 @@ -21,4 +22,5 @@ if [ -d ciat-tester ]; then fi git clone ssh://git@cu010-trove.codethink.com/cu010-trove/br6/ciat-tester cd ciat-tester +git checkout $TESTING_SHA ./test-runner.sh file:///archive/"$ARTEFACT".raw openstack tests/python.test tests/uname.test |