Branch cut for stable/silicon stream

[releng/builder.git] / jjb / integration / integration-test-jobs.yaml

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 0a82bbdf25a3de1c8376bd5d77d13e32456371c5..f4461f6a8aceca6927f6741550d7f035a6b7943d 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -19,10 +19,20 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           mvn-version: "mvn35"
           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
@@ -61,8 +71,21 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
+          csit-blocklist: >
+            bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
+            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-phosphorus.lst
+          csit-mri-list: "{csit-mri-list-phosphorus}"
+          csit-weekly-list: "{csit-weekly-list-phosphorus}"
+      - silicon:
+          branch: "stable/silicon"
           csit-blocklist: >
             bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
             netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
@@ -115,9 +138,13 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-phosphorus}"
+      - silicon:
+          branch: "stable/silicon"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-silicon}"
       - aluminium:
           branch: "stable/aluminium"
@@ -170,7 +197,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:
@@ -331,7 +358,7 @@
             -Pq
             -Dstream={stream}
             {opendaylight-infra-mvn-opts}
-          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
+            # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - "-Xmx4096m -Dmaven.compile.fork=true"
           settings: integration-settings
@@ -344,7 +371,7 @@
           goals: |
             clean install dependency:tree -DoutputFile=dependency_tree.txt
             {opendaylight-infra-mvn-opts}
-          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
+            # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - "-Xmx1024m -Dmaven.compile.fork=true"
           settings: integration-settings