Trigger reporter conditionnaly

Change-Id: I19a187d71e2f365b786e9584411c7373888ebf7b

diff --git a/maintenance-ci/mos/jobs/9.x.swarm.runner.yaml b/maintenance-ci/mos/jobs/9.x.swarm.runner.yaml
index 9461eaa8fad5d84acda489ff56af314badf0e024..8dbe3515beb887008abb8b8f483faff3ba4d51a9 100644 (file)
--- a/maintenance-ci/mos/jobs/9.x.swarm.runner.yaml
+++ b/maintenance-ci/mos/jobs/9.x.swarm.runner.yaml
@@ -19,6 +19,11 @@
         name: CLEANUP_SWARM
         default: true
         description: "Wipe jenkins swarm after tests?"
+    - bool: # this one taken away from systest-params macro because we want
+        # different default values for runner job and test jobs
+        name: RUN_REPORTER_AFTER_JOB
+        default: true
+        description: "Report results?"
     - 9x-systest-params
     - mos-jenkins-swarm-params
 

diff --git a/maintenance-ci/mos/templates/swarm-test.yaml b/maintenance-ci/mos/templates/swarm-test.yaml
index 548a4abedaee11b10871d3f1c874955bcf9a9a96..be83b7be3dfb9fef32f1e6b77274212af787e820 100644 (file)
--- a/maintenance-ci/mos/templates/swarm-test.yaml
+++ b/maintenance-ci/mos/templates/swarm-test.yaml
@@ -39,6 +39,11 @@
         name: ENV_NAME_SUFFIX
         default: "{swarm-test/env-name-suffix}"
         description: "Suffix to add to ENV_NAME"
+    - bool: # this one taken away from systest-params macro because we want
+            # different default values for runner job and test jobs
+        name: RUN_REPORTER_AFTER_JOB
+        default: false
+        description: "Report results?"
     - 9x-systest-params
     - text:
         name: EXTRA_OPTS
@@ -96,7 +101,11 @@
         regexp: "'Description string: (.*)'"
         regexp-for-failed: "'Description string: (.*)'"
 
-    - trigger-parameterized-builds:
-        - project: '9.x.swarm.test-reports'
-          condition: FAILED_OR_BETTER
-          trigger-with-no-params: true
+    - conditional-publisher:
+      - condition-kind: boolean-expression
+        condition-expression: $RUN_REPORTER_AFTER_JOB
+        action:
+        - trigger-parameterized-builds:
+          - project: '9.x.swarm.test-reports'
+            condition: FAILED_OR_BETTER
+            trigger-with-no-params: true