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 da4fb8f3dffaa01135a6681d84e3b2b5b382dd50..ff1b8f00fb5750fe6d1b9f000d48f4359eb82425 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -17,9 +17,17 @@
 
     # 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: >
               odlparent yangtools infrautils mdsal controller aaa netconf daexim bgpcep
@@ -45,8 +53,17 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+          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-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
@@ -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'