Add pipeline attribute to be passed along a pipeline

7 files changed, 18 insertions, 5 deletions

diff --git a/builder_logic.py b/builder_logic.py
index 9d422a9..7a4f248 100644
--- a/builder_logic.py
+++ b/builder_logic.py
@@ -82,6 +82,7 @@ def trigger_deploy(system):
     global buildslave_scripts_sha
     global definitions_sha
     global testing_sha
+    global pipeline
 
     # Hacky skipping of attempting to deploy if this was an aarch64 build.
     # We don't yet have deployment set up,
@@ -96,6 +97,7 @@ def trigger_deploy(system):
         'buildslave_scripts_sha':buildslave_scripts_sha,
         'definitions_sha':definitions_sha,
         'testing_sha':testing_sha,
+        'pipeline':pipeline,
     }
     log('triggering deploy')
     r = requests.post(url,data=payload)
@@ -142,6 +144,8 @@ if __name__ == '__main__':
         system = sys.argv[3]
     except:
         system = DEFAULT_SYSTEM
+    global pipeline
+    pipeline = sys.argv[4]
     if not definitions_sha or definitions_sha == 'HEAD':
         definitions_sha = get_definitions_sha('ref')
     buildslave_scripts_sha = get_buildslave_scripts_sha()
diff --git a/deploy_logic.py b/deploy_logic.py
index a0cbd2e..60f0451 100644
--- a/deploy_logic.py
+++ b/deploy_logic.py
@@ -36,13 +36,16 @@ def deploy(cluster):
     log('deployment complete')
     return exit_val
 
-def trigger_testing(artefact):
+def trigger_testing(artefact,pipeline):
     import requests
     global url
     global testing_sha
     url = '%sdeploy_complete' % ORCHE_URL
     log("triggering testing")
-    payload = {'artefact':artefact,'testing_sha':testing_sha}
+    payload = {
+            'artefact':artefact,
+            'testing_sha':testing_sha,
+            'pipeline':pipeline}
     r = requests.post(url,data=payload)
     return not r.ok
 
@@ -55,6 +58,7 @@ if __name__ == '__main__':
         testing_sha = sys.argv[3]
     except:
         testing_sha = 'HEAD'
+    pipeline = sys.argv[4]
     deploy_exit_val = deploy('clusters/tlsa.morph')
     if deploy_exit_val: _exit(deploy_exit_val)
-    _exit(trigger_testing(artefact))
+    _exit(trigger_testing(artefact,pipeline))
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