diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-10-01 00:37:44 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-10-01 00:37:44 +0100 |
| commit | 44beb691ccdf2451204dc720c0af4569d2d90d27 (patch) | |
| tree | f93f70b7939b99be031524e6678e0846c64ce0a8 /triggers | |
| parent | 6903edcefbf51947efdbf21058327d803a1a72d3 (diff) | |
| download | buildslave-scripts-44beb691ccdf2451204dc720c0af4569d2d90d27.tar.gz | |
Add pipeline attribute to be passed along a pipeline
Diffstat (limited to 'triggers')
| -rw-r--r-- | triggers/builders_trigger.sh | 3 | ||||
| -rw-r--r-- | triggers/deploy_trigger.sh | 3 | ||||
| -rw-r--r-- | triggers/firehose_trigger.sh | 1 | ||||
| -rw-r--r-- | triggers/publish_trigger.sh | 1 | ||||
| -rw-r--r-- | triggers/testing_trigger.sh | 1 |
5 files changed, 7 insertions, 2 deletions
diff --git a/triggers/builders_trigger.sh b/triggers/builders_trigger.sh index e4577cc..a4b3935 100644 --- a/triggers/builders_trigger.sh +++ b/triggers/builders_trigger.sh @@ -2,6 +2,7 @@ set -ex REF="$1" SHA="$2" SYSTEM="$3" +PIPELINE="$4" echo "[$(date "+%F %R")] Builder triggered. Ref=\"$1\"" >> ../../../../trigger_log if [ -d ybd-env ]; then @@ -17,4 +18,4 @@ cp ../build_a_system.sh . cp ../ybd.conf ybd cp ../ybd.conf ybd/config mv ../definitions . -./bin/python builder_logic.py "$REF" "$SHA" "$SYSTEM" +./bin/python builder_logic.py "$REF" "$SHA" "$SYSTEM" "$PIPELINE" diff --git a/triggers/deploy_trigger.sh b/triggers/deploy_trigger.sh index c4ac5d1..3774dae 100644 --- a/triggers/deploy_trigger.sh +++ b/triggers/deploy_trigger.sh @@ -4,6 +4,7 @@ BUILDNUMBER=$2 BUILDSLAVE_SCRIPTS_SHA=$3 DEFINITIONS_SHA=$4 TESTING_SHA=$5 +PIPELINE="$6" 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 @@ -24,4 +25,4 @@ mv ../definitions . cd definitions git checkout $DEFINITIONS_SHA cd .. -./bin/python deploy_logic.py $SYSTEM $ARTEFACT $TESING_SHA +./bin/python deploy_logic.py $SYSTEM $ARTEFACT $TESING_SHA "$PIPELINE" diff --git a/triggers/firehose_trigger.sh b/triggers/firehose_trigger.sh index 13b3a41..80ee3fd 100644 --- a/triggers/firehose_trigger.sh +++ b/triggers/firehose_trigger.sh @@ -1,6 +1,7 @@ set -ex REPO="$1" REF="$2" +PIPELINE="$3" echo "[$(date "+%F %R")] Firehose triggered with repo: $1" >> ../../../../trigger_log if [ -d src/firehose ]; then rm -rf src/firehose diff --git a/triggers/publish_trigger.sh b/triggers/publish_trigger.sh index d28a553..dc83791 100644 --- a/triggers/publish_trigger.sh +++ b/triggers/publish_trigger.sh @@ -3,6 +3,7 @@ ARTEFACT=$1 TESTING_SHA=$2 BUILDSLAVE_SCRIPTS_SHA=$3 DEFINITIONS_SHA=$4 +PIPELINE="$5" echo "[$(date "+%F %R")] Publish triggered. Artefact: $1" >> ../../../../trigger_log # Do the publish stuff here diff --git a/triggers/testing_trigger.sh b/triggers/testing_trigger.sh index d109436..b761a06 100644 --- a/triggers/testing_trigger.sh +++ b/triggers/testing_trigger.sh @@ -3,6 +3,7 @@ ARTEFACT=$1 TESTING_SHA=$2 BUILDSLAVE_SCRIPTS_SHA=$3 DEFINITIONS_SHA=$4 +PIPELINE="$5" ORCHE_URL='http://127.0.0.1:8080' echo "[$(date "+%F %R")] Testing triggered. Artefact: $1" >> ../../../../trigger_log |