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

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 233a1e730f..097942c88b 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -21,23 +21,30 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - potassium:
+      - titanium:
           branch: "master"
-          csit-list: !include: csit-jobs-potassium.lst
+          csit-list: !include: csit-jobs-titanium.lst
+          build-order: >
+            odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
+            serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
+            integration/distribution
+      - scandium:
+          branch: "stable/scandium"
+          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
-      - argon:
-          branch: "stable/argon"
-          csit-list: !include: csit-jobs-argon.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
-      - chlorine:
-          branch: "stable/chlorine"
-          csit-list: !include: csit-jobs-chlorine.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 +62,7 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - argon:
+      - titanium:
           branch: "master"
           csit-blocklist: >
             aaa controller genius lispflowmapping l2switch mdsal
@@ -65,11 +72,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-titanium.lst
+          csit-mri-list: "{csit-mri-list-titanium}"
+          csit-weekly-list: "{csit-weekly-list-titanium}"
+      - scandium:
+          branch: "stable/scandium"
           csit-blocklist: >
             aaa controller genius lispflowmapping l2switch mdsal
             netconf netvirt odlmicro sxp yangtools
@@ -78,9 +85,35 @@
             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}"
+          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
+            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-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
+            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-potassium.lst
+          csit-mri-list: "{csit-mri-list-potassium}"
+          csit-weekly-list: "{csit-weekly-list-potassium}"
 
 - project:
     name: integration-sanity
@@ -90,14 +123,22 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - argon:
+      - titanium:
           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}"
+          karaf-version: karaf4
+          csit-sanity-list: "{csit-sanity-list-titanium}"
+      - scandium:
+          branch: "stable/scandium"
+          karaf-version: karaf4
+          csit-sanity-list: "{csit-sanity-list-scandium}"
+      - calcium:
+          branch: "stable/calcium"
+          karaf-version: karaf4
+          csit-sanity-list: "{csit-sanity-list-calcium}"
+      - potassium:
+          branch: "stable/potassium"
+          karaf-version: karaf4
+          csit-sanity-list: "{csit-sanity-list-potassium}"
 
 - job-template:
     name: "integration-merge-dashboard"
@@ -167,6 +208,8 @@
           bundle-url: "{bundle-url}"
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
+      - integration-distribution-branch:
+          branch: "{branch}"
 
     builders:
       - lf-infra-pre-build
@@ -176,6 +219,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     wrappers:
       - lf-infra-wrappers:
@@ -207,6 +251,8 @@
           bundle-url: "{bundle-url}"
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
+      - integration-distribution-branch:
+          branch: "{branch}"
 
     triggers:
       - timed: "{schedule-daily}"
@@ -219,6 +265,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - email-notification:
@@ -331,6 +378,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - lf-infra-publish
@@ -437,6 +485,7 @@
                   predefined-parameters: |
                     BUNDLE_URL=$BUNDLE_URL
                     KARAF_VERSION=$KARAF_VERSION
+                    DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - lf-infra-publish
@@ -459,6 +508,8 @@
           bundle-url: "{bundle-url}"
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
+      - integration-distribution-branch:
+          branch: "{branch}"
 
     triggers:
       - timed: "{schedule-weekly}"
@@ -470,6 +521,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - email-notification:
@@ -492,6 +544,8 @@
           bundle-url: "{bundle-url}"
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
+      - integration-distribution-branch:
+          branch: "{branch}"
 
     triggers:
       - timed: "{schedule-weekly}"
@@ -503,6 +557,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - email-notification:
@@ -524,6 +579,8 @@
           bundle-url: "{bundle-url}"
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
+      - integration-distribution-branch:
+          branch: "{branch}"
 
     triggers:
       - timed: "{schedule-weekly}"
@@ -535,6 +592,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - email-notification: