Create Fluorine jobs and bump Oxygen branch

[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 496716dc097c2422148d46a07766099caf42b39f..852e0a5b957f3dd4043bedf0912e1972eeb7c1e6 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -2,40 +2,46 @@
 - project:
     name: ovsdb-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'ovsdb'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          jdk: 'openjdk8'
+          # 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'
-          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-only-{stream}
+              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}
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
       - l2gw:
           csit-list: >
-              netvirt-csit-hwvtep-1node-openstack-newton-gate-transparent-{stream}
-
+              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}