X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-patch-test.yaml;h=852e0a5b957f3dd4043bedf0912e1972eeb7c1e6;hb=refs%2Fchanges%2F83%2F68683%2F11;hp=4de61eca707cb7eb7ccdd99fcddb82d272a4b412;hpb=e5afb33e6bd80c179f9ccac11dd21b45366b3fe5;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 4de61eca7..852e0a5b9 100644
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -1,31 +1,47 @@
+---
 - project:
     name: ovsdb-patch-test
     jobs:
-        - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'ovsdb'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jdk: 'openjdk8'
+      - fluorine:
+          branch: 'master'
+          # os-branch: 'pike'
+          # issues with pike right now (esp l2gw), lets stick with ocata
+          os-branch: 'ocata'
+      - oxygen:
+          branch: 'stable/oxygen'
+          # os-branch: 'pike'
+          # issues with pike right now (esp l2gw), lets stick with ocata
+          os-branch: 'ocata'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          os-branch: 'ocata'
+      - carbon:
+          branch: 'stable/carbon'
+          os-branch: 'ocata'
+          karaf-version: karaf3
 
-    feature:
-        - genius:
-            csit-list: >
-                genius-csit-1node-genius-only-{stream}
-
-        - netvirt:
-            csit-list: >
-                netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
-
-        - core:
-            csit-list: >
-                ovsdb-csit-1node-southbound-only-{stream},
-                ovsdb-csit-1node-southbound-all-{stream},
-                ovsdb-csit-3node-clustering-only-{stream}
+    jdk: 'openjdk8'
 
+    feature:
+      - genius:
+          csit-list: >
+              genius-csit-1node-genius-all-{stream}
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+      - l2gw:
+          csit-list: >
+              netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
+      - core:
+          csit-list: >
+              ovsdb-csit-1node-gate-southbound-all-{stream},
+              ovsdb-csit-3node-gate-clustering-only-{stream}