X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=a39e02e07540fb4dfeb5a4a6709ea49bdf22e918;hb=91f9aa758d69439daa30266ff2867e33511018fa;hp=a59e694baf02bdb6021a3d0c0dc6679772bc9dc2;hpb=a999249893ffc45a1b39b61eb306407612a5c286;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index a59e694ba..a39e02e07 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -5,7 +5,7 @@
     project-name: integration-test
     jobs:
       - 'integration-patch-test-{stream}'
-      - 'integration-multipatch-test-{stream}'
+      - 'inttest-multipatch'
       - 'integration-merge-dashboard'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -15,33 +15,36 @@
       - gerrit-tox-verify:
           branch: master
           stream: master
+          build-node: centos7-builder-2c-2g
 
     # CSIT Lists in defaults.yaml
     stream:
-      - sodium:
+      - aluminium:
           branch: 'master'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-sodium.lst
+          java-version: 'openjdk11'
+          csit-list: !include: csit-jobs-aluminium.lst
           build-order: >
-              odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
-              daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
+              odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
+              daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
               bgpcep integration/distribution
 
-      - neon:
-          branch: 'stable/neon'
+      - magnesium:
+          branch: 'stable/magnesium'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-neon.lst
+          java-version: 'openjdk11'
+          csit-list: !include: csit-jobs-magnesium.lst
           build-order: >
               odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
-              daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
+              daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
               bgpcep integration/distribution
 
-      - fluorine:
-          branch: 'stable/fluorine'
+      - sodium:
+          branch: 'stable/sodium'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-fluorine.lst
+          csit-list: !include: csit-jobs-sodium.lst
           build-order: >
-              odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
+              odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
               daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
               bgpcep integration/distribution
 
@@ -51,49 +54,60 @@
     project-name: integration-test
     jobs:
       - 'integration-distribution-test-{stream}'
+      - 'integration-distribution-mri-test-{stream}'
       - 'integration-distribution-weekly-test-trigger-{stream}'
-      - 'integration-distribution-high-frequency-test-trigger-{stream}'
       - 'integration-update-csit-tests-{stream}'
 
     # CSIT Lists in defaults.yaml
     stream:
-      - sodium:
+      - aluminium:
           branch: 'master'
           csit-blacklist: >
-              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
-              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
+              nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
+              bgpcep-csit-3node-bgpclustering-all
+              bgpcep-csit-3node-bgpclustering-ha-only
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
+              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-sodium.lst
-          csit-weekly-list: '{csit-weekly-list-sodium}'
-          csit-high-frequency-list: '{csit-high-frequency-list-sodium}'
-      - neon:
-          branch: 'stable/neon'
+          csit-list: !include: csit-jobs-aluminium.lst
+          csit-mri-list: '{csit-mri-list-aluminium}'
+          csit-weekly-list: '{csit-weekly-list-aluminium}'
+      - magnesium:
+          branch: 'stable/magnesium'
           csit-blacklist: >
-              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
-              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
+              p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+              gate longevity sanity tdd tempest wip
+              bgpcep-csit-3node-bgpclustering-all
+              bgpcep-csit-3node-bgpclustering-ha-only
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
+              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-neon.lst
-          csit-weekly-list: '{csit-weekly-list-neon}'
-          csit-high-frequency-list: '{csit-high-frequency-list-neon}'
-      - fluorine:
-          branch: 'stable/fluorine'
+          csit-list: !include: csit-jobs-magnesium.lst
+          csit-mri-list: '{csit-mri-list-magnesium}'
+          csit-weekly-list: '{csit-weekly-list-magnesium}'
+      - sodium:
+          branch: 'stable/sodium'
           csit-blacklist: >
-              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
-              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo
+              p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools
+              gate longevity sanity tdd tempest wip
+              bgpcep-csit-3node-bgpclustering-all
+              bgpcep-csit-3node-bgpclustering-ha-only
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
+              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-fluorine.lst
-          csit-weekly-list: '{csit-weekly-list-fluorine}'
-          csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
+          csit-list: !include: csit-jobs-sodium.lst
+          csit-mri-list: '{csit-mri-list-sodium}'
+          csit-weekly-list: '{csit-weekly-list-sodium}'
 
 - project:
     name: integration-sanity
@@ -103,18 +117,18 @@
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - sodium:
+      - aluminium:
           branch: 'master'
           karaf-version: odl
-          csit-sanity-list: '{csit-sanity-list-sodium}'
-      - neon:
-          branch: 'stable/neon'
+          csit-sanity-list: '{csit-sanity-list-aluminium}'
+      - magnesium:
+          branch: 'stable/magnesium'
           karaf-version: odl
-          csit-sanity-list: '{csit-sanity-list-neon}'
-      - fluorine:
-          branch: 'stable/fluorine'
+          csit-sanity-list: '{csit-sanity-list-magnesium}'
+      - sodium:
+          branch: 'stable/sodium'
           karaf-version: odl
-          csit-sanity-list: '{csit-sanity-list-fluorine}'
+          csit-sanity-list: '{csit-sanity-list-sodium}'
 
 - job-template:
     name: 'integration-merge-dashboard'
@@ -309,6 +323,8 @@
       - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - maven-target:
           maven-version: 'mvn35'
           pom: '$GERRIT_PROJECT/pom.xml'
@@ -319,7 +335,7 @@
               {opendaylight-infra-mvn-opts}
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            - '-Xmx4096m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings
@@ -332,7 +348,7 @@
               {opendaylight-infra-mvn-opts}
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+            - '-Xmx1024m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings
@@ -354,16 +370,16 @@
 
 
 - job-template:
-    name: 'integration-multipatch-test-{stream}'
+    name: '{prefix}integration-multipatch-test-{stream}'
     # Goal: Build one or more patches and run all available system test on a distribution containing the change.
     # Operation: This job template checks out and builds in order each patch provided in job parameters, finally
     # it creates a distribution containing all patches and triggers the distribution test job which includes most
     # (if not all) available CSIT jobs.
 
+    id: inttest-multipatch
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true
-    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -435,6 +451,8 @@
       - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-distribution-settings'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-multipatch-builder
       - integration-upload-distribution:
           dist-pom: patch_tester/distribution/pom.xml
@@ -443,8 +461,9 @@
           condition-expression: $RUN_TEST
           steps:
             - trigger-builds:
-                - project: '{csit-list}'
-                  block: true
+                - project: >
+                      integration-distribution-test-{stream},
+                      integration-distribution-mri-test-{stream}
                   predefined-parameters: |
                     BUNDLE_URL=$BUNDLE_URL
                     KARAF_VERSION=$KARAF_VERSION
@@ -456,7 +475,7 @@
           email-prefix: '[int/dist]'
 
 - job-template:
-    name: 'integration-distribution-weekly-test-trigger-{stream}'
+    name: 'integration-distribution-mri-test-{stream}'
 
     project-type: freestyle
     node: queue-intque-2c-1g
@@ -476,7 +495,7 @@
 
     builders:
       - trigger-builds:
-          - project: '{csit-weekly-list}'
+          - project: '{csit-mri-list}'
             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
@@ -488,7 +507,7 @@
           email-prefix: '[integration]'
 
 - job-template:
-    name: 'integration-distribution-high-frequency-test-trigger-{stream}'
+    name: 'integration-distribution-weekly-test-trigger-{stream}'
 
     project-type: freestyle
     node: queue-intque-2c-1g
@@ -504,12 +523,11 @@
           karaf-version: '{karaf-version}'
 
     triggers:
-      - timed: '{schedule-high-frequency}'
+      - timed: '{schedule-weekly}'
 
     builders:
-      - lf-infra-pre-build
       - trigger-builds:
-          - project: '{csit-high-frequency-list}'
+          - project: '{csit-weekly-list}'
             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
@@ -533,6 +551,7 @@
     ######################
 
     git-url: '$GIT_URL/$PROJECT'
+    submodule-disable: false
     submodule-recursive: true
     submodule-timeout: 10
 
@@ -564,6 +583,7 @@
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
@@ -589,7 +609,7 @@
           gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'auto-update-csit-jobs-{stream}'
           gerrit-commit-message: 'Auto Update CSIT Jobs to run for {stream}'
-          reviewers-email: 'jluhrsen@redhat.com'
+          reviewers-email: 'jluhrsen@gmail.com'
 
     publishers:
       - lf-infra-publish
@@ -599,111 +619,3 @@
     views:
       - project-view
     project-name: integration
-
-- view:
-    name: csit-stable-f
-    description: 'List of stable integration jobs for managed projects'
-    job-name:
-      - aaa-csit-1node-authn-all-fluorine
-      - bgpcep-csit-1node-throughpcep-all-fluorine
-      - coe-csit-1node-container-networking-only-fluorine
-      - controller-csit-1node-akka1-all-fluorine
-      - controller-csit-1node-benchmark-all-fluorine
-      - controller-csit-1node-notifications-longevity-only-fluorine
-      - controller-csit-1node-rest-cars-perf-all-fluorine
-      - controller-csit-3node-benchmark-all-fluorine
-      - controller-csit-3node-drb-precedence-longevity-only-fluorine
-      - controller-csit-3node-rest-clust-cars-perf-ask-only-fluorine
-      - controller-csit-3node-rest-clust-cars-perf-tell-only-fluorine
-      - daexim-csit-1node-basic-only-fluorine
-      - daexim-csit-3node-clustering-basic-only-fluorine
-      - distribution-csit-1node-userfeatures-all-fluorine
-      - genius-csit-1node-upstream-only-fluorine
-      - genius-csit-3node-upstream-only-fluorine
-      - lispflowmapping-csit-1node-msmr-all-fluorine
-      - netconf-csit-1node-callhome-only-fluorine
-      - netconf-csit-1node-userfeatures-all-fluorine
-      - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-fluorine
-      - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
-      - openflowplugin-csit-1node-flow-services-all-fluorine
-      - openflowplugin-csit-1node-longevity-only-fluorine
-      - openflowplugin-csit-1node-perf-bulkomatic-only-fluorine
-      - openflowplugin-csit-1node-perf-stats-collection-only-fluorine
-      - openflowplugin-csit-1node-sanity-only-fluorine
-      - openflowplugin-csit-1node-scale-link-only-fluorine
-      - openflowplugin-csit-1node-scale-only-fluorine
-      - openflowplugin-csit-1node-scale-switch-only-fluorine
-      - openflowplugin-csit-3node-clustering-bulkomatic-only-fluorine
-      - openflowplugin-csit-3node-clustering-only-fluorine
-      - ovsdb-csit-3node-upstream-clustering-only-fluorine
-      - sfc-csit-3node-docker-full-deploy-all-fluorine
-      - sfc-csit-3node-rest-basic-all-fluorine
-    view-type: list
-    filter-executors: false
-    filter-queue: false
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-      - jacoco
-      - find-bugs
-      - robot-list
-    recurse: false
-
-- view:
-    name: csit-stable-ne
-    description: 'List of stable integration jobs for managed projects'
-    job-name:
-      - aaa-csit-1node-authn-all-neon
-      - bgpcep-csit-1node-throughpcep-all-neon
-      - coe-csit-1node-container-networking-only-neon
-      - controller-csit-1node-akka1-all-neon
-      - controller-csit-1node-benchmark-all-neon
-      - controller-csit-1node-notifications-longevity-only-neon
-      - controller-csit-1node-rest-cars-perf-all-neon
-      - controller-csit-3node-benchmark-all-neon
-      - controller-csit-3node-drb-precedence-longevity-only-neon
-      - controller-csit-3node-rest-clust-cars-perf-ask-only-neon
-      - controller-csit-3node-rest-clust-cars-perf-tell-only-neon
-      - daexim-csit-1node-basic-only-neon
-      - daexim-csit-3node-clustering-basic-only-neon
-      - distribution-csit-1node-userfeatures-all-neon
-      - genius-csit-1node-upstream-only-neon
-      - genius-csit-3node-upstream-only-neon
-      - lispflowmapping-csit-1node-msmr-all-neon
-      - netconf-csit-1node-callhome-only-neon
-      - netconf-csit-1node-userfeatures-all-neon
-      - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-neon
-      - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
-      - openflowplugin-csit-1node-flow-services-all-neon
-      - openflowplugin-csit-1node-longevity-only-neon
-      - openflowplugin-csit-1node-perf-bulkomatic-only-neon
-      - openflowplugin-csit-1node-perf-stats-collection-only-neon
-      - openflowplugin-csit-1node-sanity-only-neon
-      - openflowplugin-csit-1node-scale-link-only-neon
-      - openflowplugin-csit-1node-scale-only-neon
-      - openflowplugin-csit-1node-scale-switch-only-neon
-      - openflowplugin-csit-3node-clustering-bulkomatic-only-neon
-      - openflowplugin-csit-3node-clustering-only-neon
-      - ovsdb-csit-3node-upstream-clustering-only-neon
-      - sfc-csit-3node-docker-full-deploy-all-neon
-      - sfc-csit-3node-rest-basic-all-neon
-    view-type: list
-    filter-executors: false
-    filter-queue: false
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-      - jacoco
-      - find-bugs
-      - robot-list
-    recurse: false