Merge "Update cloud image CentOSStream8 builder x86_64"

[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 16d28d194168296a39eeb3ed9d9e8c86a97cd072..7bfa2495b2724579d075e0189661c5df760fabbc 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -22,28 +22,31 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - chlorine:
+      - potassium:
           branch: "master"
-          csit-list: !include: csit-jobs-chlorine.lst
+          csit-list: !include: csit-jobs-potassium.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
             serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
             integration/distribution
-
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
-          csit-list: !include: csit-jobs-sulfur.lst
+      - argon:
+          branch: "stable/argon"
+          csit-list: !include: csit-jobs-argon.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
             serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
             integration/distribution
-
-      - phosphorus:
-          branch: "stable/phosphorus"
-          mvn-version: "mvn35"
+      - chlorine:
+          branch: "stable/chlorine"
+          csit-list: !include: csit-jobs-chlorine.lst
+          build-order: >
+            odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
+            serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
+            integration/distribution
+      - sulfur:
+          branch: "stable/sulfur"
           java-version: "openjdk11"
-          csit-list: !include: csit-jobs-phosphorus.lst
+          csit-list: !include: csit-jobs-sulfur.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
             serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
@@ -61,10 +64,23 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
           csit-blocklist: >
-            aaa controller dluxapps genius lispflowmapping l2switch mdsal
+            aaa controller genius lispflowmapping l2switch mdsal
+            netconf netvirt odlmicro sxp 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-argon.lst
+          csit-mri-list: "{csit-mri-list-argon}"
+          csit-weekly-list: "{csit-weekly-list-argon}"
+      - chlorine:
+          branch: "stable/chlorine"
+          csit-blocklist: >
+            aaa controller genius lispflowmapping l2switch mdsal
             netconf netvirt odlmicro sxp yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
@@ -77,7 +93,7 @@
       - sulfur:
           branch: "stable/sulfur"
           csit-blocklist: >
-            aaa controller dluxapps genius lispflowmapping l2switch mdsal
+            aaa controller genius lispflowmapping l2switch mdsal
             netconf netvirt odlmicro sxp yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
@@ -87,19 +103,6 @@
           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 controller dluxapps genius lispflowmapping l2switch mdsal
-            netconf netvirt odlmicro sxp 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-phosphorus.lst
-          csit-mri-list: "{csit-mri-list-phosphorus}"
-          csit-weekly-list: "{csit-weekly-list-phosphorus}"
 
 - project:
     name: integration-sanity
@@ -109,18 +112,18 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-argon}"
+      - chlorine:
+          branch: "stable/chlorine"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-chlorine}"
       - sulfur:
           branch: "stable/sulfur"
           karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-sulfur}"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-phosphorus}"
 
 - job-template:
     name: "integration-merge-dashboard"