Merge "Add missing magnesium jobs"

[releng/builder.git] / jjb / integration / integration-test-jobs.yaml

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index efb22744881a2a4e206cf746d5dac8252e5ceddf..07b29952b1bdb1670b3a7a5c6ed6142b3ca9b291 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -18,9 +18,18 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
           mvn-version: 'mvn35'
+          csit-list: !include: csit-jobs-magnesium.lst
+          build-order: >
+              odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
+              daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
+              bgpcep integration/distribution
+
+      - sodium:
+          branch: 'stable/sodium'
+          mvn-version: 'mvn35'
           csit-list: !include: csit-jobs-sodium.lst
           build-order: >
               odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
@@ -56,8 +65,20 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
+          csit-blacklist: >
+              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
+              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              gate longevity sanity tdd tempest wip
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+              netvirt-csit-3node-1cmb
+              last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+          csit-list: !include: csit-jobs-magnesium.lst
+          csit-weekly-list: '{csit-weekly-list-magnesium}'
+      - sodium:
+          branch: 'stable/sodium'
           csit-blacklist: >
               alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
               of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
@@ -101,9 +122,13 @@
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
           karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-magnesium}'
+      - sodium:
+          branch: 'stable/sodium'
+          karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-sodium}'
       - neon:
           branch: 'stable/neon'