From: Sam Hague <shague@redhat.com>
Date: Tue, 30 Oct 2018 20:21:26 +0000 (+0000)
Subject: Merge "Add apex csit job to be triggered on distro-check"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=cf41d2b73ae2d012995b46b8b32526c9c2d92fd4;hp=0267fe8139ab92f59bfdda598e25ee52f0253ee0;p=releng%2Fbuilder.git

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 ece5c1073c..fb4237169d 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 c75f362075..104af96941 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'