Merge "Remove odlmicro CSIT from AR test"

[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 e0a3cf008fc4fbb52d8e12de80459dd733c1748c..5cc8f45deab276204219ea5e965c462b24e2db46 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -49,15 +49,6 @@
             daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping 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
-            daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
-            bgpcep integration/distribution
-
 - project:
     name: integration-distribution
     project: integration/test
@@ -73,8 +64,8 @@
       - silicon:
           branch: "master"
           csit-blocklist: >
-            alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
-            nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+            bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal nemo
+            odlmicro p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only
@@ -89,8 +80,8 @@
       - aluminium:
           branch: "stable/aluminium"
           csit-blocklist: >
-            alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
-            nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+            bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal nemo
+            odlmicro p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only
@@ -118,22 +109,6 @@
           csit-list: !include: csit-jobs-magnesium.lst
           csit-mri-list: "{csit-mri-list-magnesium}"
           csit-weekly-list: "{csit-weekly-list-magnesium}"
-      - sodium:
-          branch: "stable/sodium"
-          csit-blocklist: >
-            alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo
-            p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools
-            gate longevity sanity tdd tempest wip
-            bgpcep-csit-3node-bgpclustering-all
-            bgpcep-csit-3node-bgpclustering-ha-only
-            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
-            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
-            netvirt-csit-3node-1cmb
-            openflowplugin-csit-1node-bundle-based-reconciliation
-            last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
-          csit-list: !include: csit-jobs-sodium.lst
-          csit-mri-list: "{csit-mri-list-sodium}"
-          csit-weekly-list: "{csit-weekly-list-sodium}"
 
 - project:
     name: integration-sanity
@@ -146,7 +121,7 @@
       - silicon:
           branch: "master"
           karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-aluminium}"
+          csit-sanity-list: "{csit-sanity-list-silicon}"
       - aluminium:
           branch: "stable/aluminium"
           karaf-version: odl
@@ -155,10 +130,6 @@
           branch: "stable/magnesium"
           karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-magnesium}"
-      - sodium:
-          branch: "stable/sodium"
-          karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-sodium}"
 
 - job-template:
     name: "integration-merge-dashboard"