From 1344e3acbf7ea3fecc2bc611fb5be9fb9aa9fe49 Mon Sep 17 00:00:00 2001
From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Wed, 24 Oct 2018 15:53:32 -0700
Subject: [PATCH] Add apex csit job to be triggered on distro-check

Projects can create a list of csit jobs to trigger from
the distribution created in it's distro-check job using
the variable {csit-gate-list}. If the variable doesn't
exist, this change will not affect those projects.

Also, the bool 'block_on_csit' can be set to make
distribution-check that runs csit a voting job or
not (true vs false)

Change-Id: I8a13f21f52eeb7ab001efd0abce95d64188a8bc0
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
---
 .../distribution/distribution-templates.yaml     | 16 ++++++++++++++++
 jjb/netvirt/netvirt.yaml                         |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index ece5c1073..fb4237169 100644
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -11,6 +11,13 @@
 
     java-version: openjdk8
     mvn-version: mvn35
+    csit-gate-list: ''
+    block_on_csit: false
+    # Unless block_on_csit is true, the failure-threshold will be ignored. For project jobs that
+    # want to fail distribution check on csit jobs, they will only need a list of jobs to run
+    # plus the change of block_on_csit to true, and this failure-threshold: 'UNSTABLE' will take
+    # effect
+    failure-threshold: 'UNSTABLE'
 
     #####################
     # Job Configuration #
@@ -106,6 +113,15 @@
           dist-pom: distribution/pom.xml
       - distribution-check-bootup
 
+      - trigger-builds:
+          - project: '{csit-gate-list}'
+            block: '{obj:block_on_csit}'
+            block-thresholds:
+              failure-threshold: '{failure-threshold}'
+            predefined-parameters: |
+              BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
+
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index c75f36207..104af9694 100644
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -13,6 +13,9 @@
       - gerrit-tox-verify
       - odl-maven-jobs
 
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
     stream:
       - neon:
           branch: 'master'
-- 
2.36.6