X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=d5fca6febd5b0be7de424c0e0c9f45a4feaa0fab;hb=8e35c48f867df3bbadfb1ee17d86243a473951be;hp=ec2d9bd124c7950c591557c25758efc1d073feca;hpb=74d14c7b7904922061e1dafe7482438521aae6f7;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index ec2d9bd12..d5fca6feb 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -15,6 +15,7 @@
       - gerrit-tox-verify:
           branch: master
           stream: master
+          build-node: centos7-builder-2c-2g
 
     # CSIT Lists in defaults.yaml
     stream:
@@ -24,7 +25,7 @@
           java-version: 'openjdk11'
           csit-list: !include: csit-jobs-aluminium.lst
           build-order: >
-              odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
+              odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
               daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
               bgpcep integration/distribution
 
@@ -53,6 +54,7 @@
     project-name: integration-test
     jobs:
       - 'integration-distribution-test-{stream}'
+      - 'integration-distribution-mri-test-{stream}'
       - 'integration-distribution-weekly-test-trigger-{stream}'
       - 'integration-update-csit-tests-{stream}'
 
@@ -60,39 +62,51 @@
     stream:
       - aluminium:
           branch: 'master'
-          csit-blacklist: >
-              alto bier coe didm dluxapps groupbasedpolicy l2switch nemo
-              of-config p4plugin packetcable sfc sxp telemetry tsdr unimgr usc
+          csit-blocklist: >
+              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-aluminium.lst
+          csit-mri-list: '{csit-mri-list-aluminium}'
           csit-weekly-list: '{csit-weekly-list-aluminium}'
       - magnesium:
           branch: 'stable/magnesium'
-          csit-blacklist: >
-              alto bier coe didm dluxapps groupbasedpolicy l2switch nemo
-              of-config p4plugin packetcable sfc sxp telemetry tsdr unimgr usc
+          csit-blocklist: >
+              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-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
+          csit-blocklist: >
+              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-sodium.lst
+          csit-mri-list: '{csit-mri-list-sodium}'
           csit-weekly-list: '{csit-weekly-list-sodium}'
 
 - project:
@@ -447,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
@@ -459,6 +474,38 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[int/dist]'
 
+- job-template:
+    name: 'integration-distribution-mri-test-{stream}'
+
+    project-type: freestyle
+    node: queue-intque-2c-1g
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+
+    triggers:
+      - timed: '{schedule-weekly}'
+
+    builders:
+      - trigger-builds:
+          - project: '{csit-mri-list}'
+            block: true
+            predefined-parameters: |
+              BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[integration]'
+
 - job-template:
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 
@@ -526,9 +573,9 @@
           branch: master  # Hardcode as releng/builder only has master
           lftools-version: '{lftools-version}'
       - string:
-          name: CSIT_BLACKLIST
-          default: '{csit-blacklist}'
-          description: Space separated list of jobs strings to blacklist.
+          name: CSIT_BLOCKLIST
+          default: '{csit-blocklist}'
+          description: Space separated list of jobs strings to blocklist.
 
     scm:
       - lf-infra-gerrit-scm:
@@ -567,6 +614,15 @@
     publishers:
       - lf-infra-publish
 
+- project:
+    name: integration-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: integration
+    project-name: integration
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: integration-view
     views: