Merge "Remove validate-job for mdsal neon stream"

[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 9cf383d60db68660d2af4dc99b35102d78a35c1c..ff1b8f00fb5750fe6d1b9f000d48f4359eb82425 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -17,21 +17,29 @@
 
     # 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
+              odlparent yangtools infrautils mdsal controller aaa netconf daexim bgpcep
+              ovsdb neutron lispflowmapping openflowplugin coe genius sfc netvirt
 
 - project:
     name: integration-distribution
@@ -45,20 +53,29 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - fluorine:
+      - neon:
           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-neon.lst
+          csit-weekly-list: '{csit-weekly-list-neon}'
+          csit-high-frequency-list: '{csit-high-frequency-list-neon}'
+      - fluorine:
+          branch: 'stable/fluorine'
+          csit-blacklist: >
+              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 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}'
@@ -71,9 +88,13 @@
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-neon}'
+      - fluorine:
+          branch: 'stable/fluorine'
+          karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-fluorine}'
       - oxygen:
           branch: 'stable/oxygen'
@@ -479,3 +500,9 @@
 
     publishers:
       - lf-infra-publish
+
+- view:
+    name: integration
+    description: 'List of integration jobs'
+    regex: '^integration-.*'
+    <<: *releng_view_common