Merge "Fix for Pike/Queens Jobs"

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

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 20b575163a6e8a8b72f7b513bda647c9020c6cc3..e52dc48d9f53ef3b367335d03176680040654def 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -1,35 +1,45 @@
+---
 - project:
     name: openflowplugin-patch-test
     jobs:
-        - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jdk: 'openjdk8'
+      - fluorine:
+          branch: 'master'
+          os-branch: 'ocata'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'ocata'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          os-branch: 'ocata'
+      - carbon:
+          branch: 'stable/carbon'
+          os-branch: 'ocata'
+          karaf-version: 'karaf3'
 
-    feature:
-        - core:
-            csit-list: >
-                openflowplugin-csit-1node-flow-services-only-{stream},
-                openflowplugin-csit-1node-flow-services-all-{stream},
-                openflowplugin-csit-1node-scalability-only-{stream},
-                openflowplugin-csit-1node-cbench-performance-only-{stream},
-                openflowplugin-csit-1node-config-performance-only-{stream},
-                openflowplugin-csit-3node-clustering-only-{stream}
+    jdk: 'openjdk8'
 
-        - netvirt:
-            csit-list: >
-                netvirt-csit-1node-openstack-mitaka-gate-transparent-{stream}
+    feature:
+      - core:
+          csit-list: >
+              openflowplugin-csit-1node-gate-flow-services-all-{stream},
+              openflowplugin-csit-1node-gate-scale-only-{stream},
+              openflowplugin-csit-1node-gate-perf-stats-collection-only-{stream},
+              openflowplugin-csit-1node-gate-perf-bulkomatic-only-{stream},
+              openflowplugin-csit-3node-gate-clustering-only-{stream},
+              openflowplugin-csit-3node-gate-clustering-bulkomatic-only-{stream},
+              openflowplugin-csit-3node-gate-clustering-perf-bulkomatic-only-{stream}
 
-        - cluster-netvirt:
-            csit-list: >
-                netvirt-csit-3node-openstack-mitaka-gate-transparent-{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}