X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=18e614c44b5cfedaf6cc0a1bfcaee765f00fc31e;hb=ddbf3cde9195f2b3635318fed187269504853ab1;hp=15aa436b89e18cb219867d2aa591b1caadf391c9;hpb=6a0cc71b1f2266a420733a24cbc12c272061bfe6;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 15aa436b8..18e614c44 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -15,31 +15,31 @@
           branch: master
           stream: master
 
-    # CSIT Lists in releng-defaults.yaml
+    # CSIT Lists in defaults.yaml
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           mvn-version: 'mvn35'
+          csit-list: !include: csit-jobs-neon.lst
+          build-order: >
+              odlparent yangtools infrautils mdsal controller aaa netconf daexim bgpcep
+              ovsdb neutron lispflowmapping openflowplugin coe genius sfc netvirt
+
+      - fluorine:
+          branch: 'stable/fluorine'
+          mvn-version: 'mvn35'
           csit-list: !include: csit-jobs-fluorine.lst
           build-order: >
-              infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
-              lispflowmapping openflowplugin coe genius sfc netvirt
+              odlparent yangtools infrautils mdsal controller aaa netconf daexim bgpcep
+              ovsdb neutron lispflowmapping openflowplugin coe genius sfc netvirt
 
       - oxygen:
           branch: 'stable/oxygen'
           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: 'mvn35'
-          csit-list: !include: csit-jobs-nitrogen.lst
-          build-order: >
-              infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
-              lispflowmapping openflowplugin coe genius sfc netvirt
+              odlparent yangtools infrautils mdsal controller aaa netconf daexim bgpcep
+              ovsdb neutron lispflowmapping openflowplugin coe genius sfc netvirt
 
 - project:
     name: integration-distribution
@@ -51,33 +51,26 @@
       - '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
+              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd tempest wip
           csit-list: !include: csit-jobs-fluorine.lst
           csit-weekly-list: '{csit-weekly-list-fluorine}'
           csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
       - oxygen:
           branch: 'stable/oxygen'
           csit-blacklist: >
-              capwap centinel coe didm iotdm jsonrpc lacp messaging4transport netide nic
-              ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd wip
+              capwap centinel didm iotdm jsonrpc lacp messaging4transport netide nic
+              ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd tempest wip
           csit-list: !include: csit-jobs-oxygen.lst
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
 
-      - 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}'
-
 - project:
     name: integration-sanity
     project: integration/test
@@ -94,10 +87,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}'
@@ -494,7 +483,13 @@
           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: 'integration-dev@lists.opendaylight.org'
+          reviewers-email: 'jluhrsen@redhat.com'
 
     publishers:
       - lf-infra-publish
+
+- view:
+    name: integration
+    description: 'List of integration jobs'
+    regex: '^integration-.*'
+    <<: *releng_view_common