Merge "Update cloud image CentOS7 devstack stein"

[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 f4461f6a8aceca6927f6741550d7f035a6b7943d..1ea80ad64ec60e31d74d80599423407d0fc571d6 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -49,16 +49,6 @@
             daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
             bgpcep integration/distribution
 
-      - magnesium:
-          branch: "stable/magnesium"
-          mvn-version: "mvn35"
-          java-version: "openjdk11"
-          csit-list: !include: csit-jobs-magnesium.lst
-          build-order: >
-            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
-            bgpcep integration/distribution
-
 - project:
     name: integration-distribution
     project: integration/test
@@ -74,8 +64,8 @@
       - phosphorus:
           branch: "master"
           csit-blocklist: >
-            bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
-            netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            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
@@ -87,8 +77,8 @@
       - silicon:
           branch: "stable/silicon"
           csit-blocklist: >
-            bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
-            netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            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
@@ -113,22 +103,6 @@
           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-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}"
 
 - project:
     name: integration-sanity
@@ -150,10 +124,6 @@
           branch: "stable/aluminium"
           karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-aluminium}"
-      - magnesium:
-          branch: "stable/magnesium"
-          karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-magnesium}"
 
 - job-template:
     name: "integration-merge-dashboard"
@@ -633,7 +603,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: ""
+          reviewers-email: "jenkins-releng@opendaylight.org"
 
     publishers:
       - lf-infra-publish