Merge "Switch global-jjb jobs to use mvn35"

[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 a08356fbbd6008865a7f8bb586e89f727beb34f3..26f9cf6cc087c93aa0bb94ba1d7ef83f7cce5e2d 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -19,7 +19,7 @@
     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
@@ -62,7 +54,6 @@
           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: >
@@ -71,15 +62,6 @@
           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}'