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

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 9041340e0..3ac00be7f 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -21,23 +21,23 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - calcium:
+      - scandium:
           branch: "master"
-          csit-list: !include: csit-jobs-calcium.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
-      - potassium:
-          branch: "stable/potassium"
-          csit-list: !include: csit-jobs-potassium.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
-      - argon:
-          branch: "stable/argon"
-          csit-list: !include: csit-jobs-argon.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
@@ -55,7 +55,7 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - calcium:
+      - scandium:
           branch: "master"
           csit-blocklist: >
             aaa controller genius lispflowmapping l2switch mdsal
@@ -65,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-calcium.lst
-          csit-mri-list: "{csit-mri-list-calcium}"
-          csit-weekly-list: "{csit-weekly-list-calcium}"
-      - potassium:
-          branch: "stable/potassium"
+          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
@@ -78,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-potassium.lst
-          csit-mri-list: "{csit-mri-list-potassium}"
-          csit-weekly-list: "{csit-weekly-list-potassium}"
-      - argon:
-          branch: "stable/argon"
+          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
@@ -91,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-argon.lst
-          csit-mri-list: "{csit-mri-list-argon}"
-          csit-weekly-list: "{csit-weekly-list-argon}"
+          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
@@ -103,18 +103,18 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - calcium:
+      - scandium:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-scandium}"
+      - calcium:
+          branch: "stable/calcium"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-calcium}"
       - potassium:
           branch: "stable/potassium"
           karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-potassium}"
-      - argon:
-          branch: "stable/argon"
-          karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-argon}"
 
 - job-template:
     name: "integration-merge-dashboard"