Merge "Update transportpce 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 52e45fe6ef628bda2a9430cab2c4999fe9c7d29c..994684ceaf552ed414248659f6ce1c11e31fda1f 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -17,28 +17,33 @@
           stream: master
           build-node: centos7-builder-2c-2g
 
+    mvn-version: "mvn38"
+    java-version: "openjdk17"
+
     # CSIT Lists in defaults.yaml
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          mvn-version: "mvn38"
-          java-version: "openjdk11"
           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
-
+      - 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"
-          mvn-version: "mvn38"
           java-version: "openjdk11"
           csit-list: !include: csit-jobs-sulfur.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"
@@ -49,16 +54,6 @@
             serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
             integration/distribution
 
-      - silicon:
-          branch: "stable/silicon"
-          mvn-version: "mvn35"
-          java-version: "openjdk11"
-          csit-list: !include: csit-jobs-silicon.lst
-          build-order: >
-            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
-            bgpcep integration/distribution
-
 - project:
     name: integration-distribution
     project: integration/test
@@ -71,10 +66,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
@@ -87,7 +95,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
@@ -100,7 +108,7 @@
       - phosphorus:
           branch: "stable/phosphorus"
           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
@@ -110,19 +118,6 @@
           csit-list: !include: csit-jobs-phosphorus.lst
           csit-mri-list: "{csit-mri-list-phosphorus}"
           csit-weekly-list: "{csit-weekly-list-phosphorus}"
-      - silicon:
-          branch: "stable/silicon"
-          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-silicon.lst
-          csit-mri-list: "{csit-mri-list-silicon}"
-          csit-weekly-list: "{csit-weekly-list-silicon}"
 
 - project:
     name: integration-sanity
@@ -132,9 +127,13 @@
       - "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"
@@ -144,10 +143,6 @@
           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}"
 
 - job-template:
     name: "integration-merge-dashboard"