Fix aluminium after stable branch cut

[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 78ae351289a6f40f9a9a687f74ab5bd63f97b50e..0b06e561b67045253fa98b03478a9777ea738b70 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -18,10 +18,20 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           mvn-version: 'mvn35'
           java-version: 'openjdk11'
+          csit-list: !include: csit-jobs-aluminium.lst
+          build-order: >
+              odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
+              daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
+              bgpcep integration/distribution
+
+      - magnesium:
+          branch: 'stable/magnesium'
+          mvn-version: 'mvn35'
+          java-version: 'openjdk11'
           csit-list: !include: csit-jobs-magnesium.lst
           build-order: >
               odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
@@ -57,8 +67,20 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          csit-blacklist: >
+              alto bier coe didm dluxapps groupbasedpolicy l2switch nemo
+              of-config p4plugin packetcable sfc 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-aluminium.lst
+          csit-weekly-list: '{csit-weekly-list-aluminium}'
+      - magnesium:
+          branch: 'stable/magnesium'
           csit-blacklist: >
               alto bier coe didm dluxapps groupbasedpolicy l2switch nemo
               of-config p4plugin packetcable sfc sxp telemetry tsdr unimgr usc
@@ -102,9 +124,13 @@
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-aluminium}'
+      - magnesium:
+          branch: 'stable/magnesium'
+          karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-magnesium}'
       - sodium:
           branch: 'stable/sodium'