Merge "Add apex csit job to be triggered on distro-check"

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index ece5c1073cc6aecac37b2c15d9ad47a7c4567580..fb4237169d7b7c143a9362775207699c05df6905 100644 (file)
--- 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 c75f3620751ece9dc5a7406c2b18ed2f84e38ab6..104af96941c508b26704bafb0fb1fbe48db63455 100644 (file)
--- 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'