Switch dlux to using new gjjb maven-merge 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 215914b9dde6a9c6fe2fb4b22f51db023525f67d..184a2ae1272c04fa3746a2ec759294b22d58ba81 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -9,27 +9,34 @@
 
     # Project branches
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
+          os-branch: 'ocata'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          os-branch: 'ocata'
+      - carbon:
+          branch: 'stable/carbon'
+          os-branch: 'ocata'
+          karaf-version: 'karaf3'
+
+    jdk: 'openjdk8'
 
     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}
+              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}
 
       - 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-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}