X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=07b29952b1bdb1670b3a7a5c6ed6142b3ca9b291;hb=6bb383a4c8b7c8e90b192df1e3ab79dd86f2d3b1;hp=c8754673b92abb3b210360459145324a193272e6;hpb=c6b39d2988bb38129f3dd203cce55b7abfbae29a;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index c8754673b..07b29952b 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -18,9 +18,18 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
           mvn-version: 'mvn35'
+          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
+              bgpcep integration/distribution
+
+      - sodium:
+          branch: 'stable/sodium'
+          mvn-version: 'mvn35'
           csit-list: !include: csit-jobs-sodium.lst
           build-order: >
               odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
@@ -52,13 +61,24 @@
     jobs:
       - 'integration-distribution-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:
+      - magnesium:
           branch: 'master'
+          csit-blacklist: >
+              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
+              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              gate longevity sanity tdd tempest wip
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+              netvirt-csit-3node-1cmb
+              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-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
@@ -69,7 +89,6 @@
               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-blacklist: >
@@ -82,7 +101,6 @@
               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-blacklist: >
@@ -95,7 +113,6 @@
               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}'
 
 - project:
     name: integration-sanity
@@ -105,9 +122,13 @@
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
           karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-magnesium}'
+      - sodium:
+          branch: 'stable/sodium'
+          karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-sodium}'
       - neon:
           branch: 'stable/neon'
@@ -490,39 +511,6 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[integration]'
 
-- job-template:
-    name: 'integration-distribution-high-frequency-test-trigger-{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-high-frequency}'
-
-    builders:
-      - lf-infra-pre-build
-      - trigger-builds:
-          - project: '{csit-high-frequency-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-update-csit-tests-{stream}'
 
@@ -536,6 +524,7 @@
     ######################
 
     git-url: '$GIT_URL/$PROJECT'
+    submodule-disable: false
     submodule-recursive: true
     submodule-timeout: 10
 
@@ -567,6 +556,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
@@ -592,7 +582,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