X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=d3b8cab99d90521beac2bc4fd0fda0429e8e81ef;hb=HEAD;hp=7bfa2495b2724579d075e0189661c5df760fabbc;hpb=440bc45d10009b58a41968ae13a4eb5a7d408a24;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 7bfa2495b..3ac00be7f 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -8,45 +8,36 @@
       - "inttest-multipatch"
       - "integration-merge-dashboard"
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: integration/test
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-integrationtest/32934/
           rtd-token: 70766f97941a74ef80b84749ac4799e5ddeee99a
       - gerrit-tox-verify:
           branch: master
           stream: master
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
 
     mvn-version: "mvn38"
-    java-version: "openjdk17"
 
     # CSIT Lists in defaults.yaml
     stream:
-      - potassium:
+      - scandium:
           branch: "master"
-          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
-      - argon:
-          branch: "stable/argon"
-          csit-list: !include: csit-jobs-argon.lst
+          csit-list: !include: csit-jobs-scandium.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
+      - calcium:
+          branch: "stable/calcium"
+          csit-list: !include: csit-jobs-calcium.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
+      - potassium:
+          branch: "stable/potassium"
+          csit-list: !include: csit-jobs-potassium.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
             serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
@@ -64,7 +55,7 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - argon:
+      - scandium:
           branch: "master"
           csit-blocklist: >
             aaa controller genius lispflowmapping l2switch mdsal
@@ -74,11 +65,11 @@
             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-list: !include: csit-jobs-scandium.lst
+          csit-mri-list: "{csit-mri-list-scandium}"
+          csit-weekly-list: "{csit-weekly-list-scandium}"
+      - calcium:
+          branch: "stable/calcium"
           csit-blocklist: >
             aaa controller genius lispflowmapping l2switch mdsal
             netconf netvirt odlmicro sxp yangtools
@@ -87,11 +78,11 @@
             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-chlorine.lst
-          csit-mri-list: "{csit-mri-list-chlorine}"
-          csit-weekly-list: "{csit-weekly-list-chlorine}"
-      - sulfur:
-          branch: "stable/sulfur"
+          csit-list: !include: csit-jobs-calcium.lst
+          csit-mri-list: "{csit-mri-list-calcium}"
+          csit-weekly-list: "{csit-weekly-list-calcium}"
+      - potassium:
+          branch: "stable/potassium"
           csit-blocklist: >
             aaa controller genius lispflowmapping l2switch mdsal
             netconf netvirt odlmicro sxp yangtools
@@ -100,9 +91,9 @@
             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}"
+          csit-list: !include: csit-jobs-potassium.lst
+          csit-mri-list: "{csit-mri-list-potassium}"
+          csit-weekly-list: "{csit-weekly-list-potassium}"
 
 - project:
     name: integration-sanity
@@ -112,18 +103,18 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - argon:
+      - scandium:
           branch: "master"
           karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-argon}"
-      - chlorine:
-          branch: "stable/chlorine"
+          csit-sanity-list: "{csit-sanity-list-scandium}"
+      - calcium:
+          branch: "stable/calcium"
           karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-chlorine}"
-      - sulfur:
-          branch: "stable/sulfur"
+          csit-sanity-list: "{csit-sanity-list-calcium}"
+      - potassium:
+          branch: "stable/potassium"
           karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-sulfur}"
+          csit-sanity-list: "{csit-sanity-list-potassium}"
 
 - job-template:
     name: "integration-merge-dashboard"