Feat!: Remove all stable/aluminium 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 0baa6db296b3f2f4311378433ec67f71c72c9c6e..57d1c586eb8c53e5d78d5b03f0e852c41ae543fb 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -19,34 +19,34 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           mvn-version: "mvn35"
           java-version: "openjdk11"
-          csit-list: !include: csit-jobs-phosphorus.lst
+          csit-list: !include: csit-jobs-sulfur.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
             daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
             bgpcep integration/distribution
 
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
           mvn-version: "mvn35"
           java-version: "openjdk11"
-          csit-list: !include: csit-jobs-silicon.lst
+          csit-list: !include: csit-jobs-phosphorus.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
             daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
             bgpcep integration/distribution
 
-      - aluminium:
-          branch: "stable/aluminium"
+      - silicon:
+          branch: "stable/silicon"
           mvn-version: "mvn35"
           java-version: "openjdk11"
-          csit-list: !include: csit-jobs-aluminium.lst
+          csit-list: !include: csit-jobs-silicon.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
+            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
             bgpcep integration/distribution
 
 - project:
@@ -61,8 +61,21 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+          csit-blocklist: >
+            aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
+            netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            gate longevity sanity tdd tempest wip
+            bgpcep-csit-3node-bgpclustering-all
+            bgpcep-csit-3node-bgpclustering-ha-only
+            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-sulfur.lst
+          csit-mri-list: "{csit-mri-list-sulfur}"
+          csit-weekly-list: "{csit-weekly-list-sulfur}"
+      - phosphorus:
+          branch: "stable/phosphorus"
           csit-blocklist: >
             aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
             netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
@@ -87,22 +100,6 @@
           csit-list: !include: csit-jobs-silicon.lst
           csit-mri-list: "{csit-mri-list-silicon}"
           csit-weekly-list: "{csit-weekly-list-silicon}"
-      - aluminium:
-          branch: "stable/aluminium"
-          csit-blocklist: >
-            bier controller dluxapps lispflowmapping l2switch mdsal nemo
-            odlmicro packetcable sfc sxp telemetry tsdr 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-aluminium.lst
-          csit-mri-list: "{csit-mri-list-aluminium}"
-          csit-weekly-list: "{csit-weekly-list-aluminium}"
 
 - project:
     name: integration-sanity
@@ -112,18 +109,18 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-sulfur}"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-phosphorus}"
       - silicon:
           branch: "stable/silicon"
           karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-silicon}"
-      - aluminium:
-          branch: "stable/aluminium"
-          karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-aluminium}"
 
 - job-template:
     name: "integration-merge-dashboard"
@@ -167,7 +164,7 @@
             - file-id: odl-elastic-cloud
               target: "$HOME/.netrc"
       - integration-install-robotframework
-        # yamllint disable-line rule:line-length
+      # yamllint disable-line rule:line-length
       - shell: python3 $WORKSPACE/test/csit/scripts/push_dashboard.py a4ff38b99ef2c7626450543021b4c134.us-east-1.aws.found.io:9243
 
     publishers: