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 9693db77b705634d63a80f91475c6601211c110a..852e0a5b957f3dd4043bedf0912e1972eeb7c1e6 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -1,35 +1,47 @@
+---
 - project:
     name: ovsdb-patch-test
     jobs:
-        - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'ovsdb'
 
-    feature: 'all'
-
-    # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: 'openjdk8'
-            csit-list: >
-                ovsdb-csit-1node-southbound-only-{stream},
-                ovsdb-csit-1node-southbound-all-{stream},
-                ovsdb-csit-3node-clustering-only-{stream}
+      - 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
 
-        - boron:
-            branch: 'stable/boron'
-            jdk: 'openjdk8'
-            csit-list: >
-                ovsdb-csit-1node-southbound-only-{stream},
-                ovsdb-csit-1node-southbound-all-{stream},
-                ovsdb-csit-3node-clustering-only-{stream}
+    jdk: 'openjdk8'
 
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: 'openjdk7'
-            csit-list: >
-                ovsdb-csit-1node-southbound-only-{stream},
-                ovsdb-csit-1node-southbound-all-{stream},
-                ovsdb-csit-3node-clustering-only-{stream}
+    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}