Merge "Switch all projects to use new maven-merge job"

[releng/builder.git] / jjb / ovsdb / ovsdb-patch-test.yaml

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 53fca673095ae8b55679f7cb98598cde1616074b..ae1f2b693faa44d7b633d0a78805c55e7907d2e2 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -8,23 +8,33 @@
     project: 'ovsdb'
 
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
+          os-branch: 'pike'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          os-branch: 'ocata'
+      - carbon:
+          branch: 'stable/carbon'
+          os-branch: 'ocata'
+          karaf-version: karaf3
+
+    jdk: 'openjdk8'
 
     feature:
       - genius:
           csit-list: >
-              genius-csit-1node-genius-only-{stream}
+              genius-csit-1node-genius-all-{stream}
       - netvirt:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
-
+              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-only-{stream},
               ovsdb-csit-1node-gate-southbound-all-{stream},
               ovsdb-csit-3node-gate-clustering-only-{stream}