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

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 1bebf9bef..3ac00be7f 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -8,42 +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"
 
     # CSIT Lists in defaults.yaml
     stream:
-      - chlorine:
+      - scandium:
           branch: "master"
-          mvn-version: "mvn38"
-          java-version: "openjdk11"
-          csit-list: !include: csit-jobs-chlorine.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
-
-      - sulfur:
-          branch: "stable/sulfur"
-          mvn-version: "mvn38"
-          java-version: "openjdk11"
-          csit-list: !include: csit-jobs-sulfur.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
-
-      - phosphorus:
-          branch: "stable/phosphorus"
-          mvn-version: "mvn35"
-          java-version: "openjdk11"
-          csit-list: !include: csit-jobs-phosphorus.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
@@ -61,45 +55,45 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - chlorine:
+      - scandium:
           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-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-scandium.lst
+          csit-mri-list: "{csit-mri-list-scandium}"
+          csit-weekly-list: "{csit-weekly-list-scandium}"
+      - calcium:
+          branch: "stable/calcium"
           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-sulfur.lst
-          csit-mri-list: "{csit-mri-list-sulfur}"
-          csit-weekly-list: "{csit-weekly-list-sulfur}"
-      - phosphorus:
-          branch: "stable/phosphorus"
+          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 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-phosphorus.lst
-          csit-mri-list: "{csit-mri-list-phosphorus}"
-          csit-weekly-list: "{csit-weekly-list-phosphorus}"
+          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
@@ -109,18 +103,18 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - chlorine:
+      - scandium:
           branch: "master"
           karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-chlorine}"
-      - sulfur:
-          branch: "stable/sulfur"
+          csit-sanity-list: "{csit-sanity-list-scandium}"
+      - calcium:
+          branch: "stable/calcium"
           karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-sulfur}"
-      - phosphorus:
-          branch: "stable/phosphorus"
+          csit-sanity-list: "{csit-sanity-list-calcium}"
+      - potassium:
+          branch: "stable/potassium"
           karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-phosphorus}"
+          csit-sanity-list: "{csit-sanity-list-potassium}"
 
 - job-template:
     name: "integration-merge-dashboard"