X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=cfde9c0501a6f10d58bd92170efda939b0313e7a;hb=79652b59dc80982e0780196e4c34070aca6eafe9;hp=38555dbc0abaed833421804f8e71292498dd0979;hpb=b8915b51744ff754609469754f0d40c761c46cce;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 38555dbc0..cfde9c050 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -15,11 +15,11 @@
           branch: master
           stream: master
 
-    # CSIT Lists in releng-defaults.yaml
+    # CSIT Lists in defaults.yaml
     stream:
       - fluorine:
           branch: 'master'
-          mvn-version: 'mvn33'
+          mvn-version: 'mvn35'
           csit-list: !include: csit-jobs-fluorine.lst
           build-order: >
               infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
@@ -27,20 +27,12 @@
 
       - oxygen:
           branch: 'stable/oxygen'
-          mvn-version: 'mvn33'
+          mvn-version: 'mvn35'
           csit-list: !include: csit-jobs-oxygen.lst
           build-order: >
               infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
               lispflowmapping openflowplugin coe genius sfc netvirt
 
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          mvn-version: 'mvn33'
-          csit-list: !include: csit-jobs-nitrogen.lst
-          build-order: >
-              infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
-              lispflowmapping openflowplugin coe genius sfc netvirt
-
 - project:
     name: integration-distribution
     project: integration/test
@@ -51,35 +43,25 @@
       - 'integration-distribution-high-frequency-test-trigger-{stream}'
       - 'integration-update-csit-tests-{stream}'
 
-    # CSIT Lists in releng-defaults.yaml
+    # CSIT Lists in defaults.yaml
     stream:
       - fluorine:
           branch: 'master'
           csit-blacklist: >
-              alto bier capwap centinel coe didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
+              alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
               l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
               sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-fluorine.lst
           csit-weekly-list: '{csit-weekly-list-fluorine}'
           csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
-          mvn-version: 'mvn35'
       - oxygen:
           branch: 'stable/oxygen'
           csit-blacklist: >
-              capwap centinel coe didm iotdm jsonrpc lacp messaging4transport netide nic
+              capwap centinel didm iotdm jsonrpc lacp messaging4transport netide nic
               ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-oxygen.lst
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
-          mvn-version: 'mvn35'
-
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          csit-blacklist: capwap centinel coe didm iotdm jsonrpc lacp netide tsdr gate longevity sanity tdd wip
-          csit-list: !include: csit-jobs-nitrogen.lst
-          csit-weekly-list: '{csit-weekly-list-nitrogen}'
-          csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
-          mvn-version: 'mvn35'
 
 - project:
     name: integration-sanity
@@ -97,10 +79,6 @@
           branch: 'stable/oxygen'
           karaf-version: karaf4
           csit-sanity-list: '{csit-sanity-list-oxygen}'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          karaf-version: karaf4
-          csit-sanity-list: '{csit-sanity-list-nitrogen}'
 
 - job-template:
     name: 'integration-distribution-test-{stream}'
@@ -491,10 +469,13 @@
       - shell: |
           git status
           git add jjb/integration/*.lst
-      - opendaylight-infra-push-gerrit-patch:
-          project: "releng/builder"
-          gerrit-topic: "auto-update-csit-jobs-{stream}"
-          gerrit-commit-message: "Auto Update CSIT Jobs to run for {stream}"
+      - lf-infra-push-gerrit-patch:
+          project: 'releng/builder'
+          gerrit-user: 'jenkins-$SILO'
+          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'
 
     publishers:
       - lf-infra-publish