X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=1bebf9bef8cc3beabcbafe01726b137f3d18bdc8;hb=cf656f63255c72362c5c3ca0106f49d3e84f3660;hp=17eb89ccbb7d79507cb213241a196987c14c394b;hpb=9e2fcda3f9f1163ab8552e7550ae7a9999ae2c07;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 17eb89ccb..1bebf9bef 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -19,15 +19,25 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
-          mvn-version: "mvn35"
+          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
+
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: "mvn38"
           java-version: "openjdk11"
           csit-list: !include: csit-jobs-sulfur.lst
           build-order: >
-            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
-            bgpcep integration/distribution
+            odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
+            serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
+            integration/distribution
 
       - phosphorus:
           branch: "stable/phosphorus"
@@ -35,19 +45,9 @@
           java-version: "openjdk11"
           csit-list: !include: csit-jobs-phosphorus.lst
           build-order: >
-            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
-            bgpcep 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
+            odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
+            serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
+            integration/distribution
 
 - project:
     name: integration-distribution
@@ -61,11 +61,24 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           csit-blocklist: >
-            aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
-            netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            aaa controller dluxapps 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-blocklist: >
+            aaa controller dluxapps 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
@@ -77,8 +90,8 @@
       - phosphorus:
           branch: "stable/phosphorus"
           csit-blocklist: >
-            aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
-            netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            aaa controller dluxapps 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
@@ -87,19 +100,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
@@ -109,18 +109,18 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-chlorine}"
+      - sulfur:
+          branch: "stable/sulfur"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-sulfur}"
       - phosphorus:
           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"
@@ -164,7 +164,7 @@
             - file-id: odl-elastic-cloud
               target: "$HOME/.netrc"
       - integration-install-robotframework
-      # yamllint disable-line rule:line-length
+        # yamllint disable-line rule:line-length
       - shell: python3 $WORKSPACE/test/csit/scripts/push_dashboard.py a4ff38b99ef2c7626450543021b4c134.us-east-1.aws.found.io:9243
 
     publishers:
@@ -276,7 +276,7 @@
       - integration-distribution-git-url:
           git-url: "{git-url}"
       - maven-exec:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -318,7 +318,7 @@
       - lf-update-java-alternatives:
           java-version: "{java-version}"
       - maven-target:
-          maven-version: "mvn35"
+          maven-version: "{mvn-version}"
           pom: "$GERRIT_PROJECT/pom.xml"
           goals: |
             clean install dependency:tree -DoutputFile=dependency_tree.txt
@@ -333,7 +333,7 @@
           global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
           pom: distribution/pom.xml
           goals: |
             clean install dependency:tree -DoutputFile=dependency_tree.txt
@@ -415,7 +415,7 @@
       - lf-infra-maven-parameters:
           mvn-opts: ""
           mvn-params: ""
-          mvn-version: mvn35
+          mvn-version: "{mvn-version}"
           staging-profile-id: "" # Staging repos do not make sense for this job
 
     wrappers: