Merge "Update to global-jjb v0.12.1"

[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 a07b96cc69de838a8de70fc2686280c640e3717c..4958f49f3a39ca32cfeacabfd4770e31d04525ff 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -10,29 +10,27 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
+          os-branch: 'pike'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
+          os-branch: 'ocata'
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
+          os-branch: 'ocata'
           karaf-version: karaf3
 
+    jdk: 'openjdk8'
+
     feature:
       - genius:
           csit-list: >
               genius-csit-1node-genius-all-{stream}
       - netvirt:
           csit-list: >
-              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
       - l2gw:
           csit-list: >
-              netvirt-csit-hwvtep-1node-openstack-ocata-gate-stateful-{stream}
+              netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
 
       - core:
           csit-list: >