Merge "Improve branch cutting scripts"

[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..d1104aa11b78378b450ab514432a19c86b505c7b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -9,27 +9,37 @@
 
     # Project branches
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'
+          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}
+              openflowplugin-csit-1node-gate-flow-services-only-{stream},
+              openflowplugin-csit-1node-gate-flow-services-all-{stream},
+              openflowplugin-csit-1node-gate-scalability-only-{stream},
+              openflowplugin-csit-1node-periodic-gate-scale-stats-collection-daily-only-{stream},
+              openflowplugin-csit-1node-periodic-gate-bulkomatic-perf-daily-only-{stream},
+              openflowplugin-csit-3node-gate-clustering-only-{stream},
+              openflowplugin-csit-3node-periodic-gate-bulkomatic-clustering-daily-only-{stream},
+              openflowplugin-csit-3node-periodic-gate-bulkomatic-clustering-perf-daily-only-{stream}
 
       - netvirt:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
 
       - cluster-netvirt:
           csit-list: >
-              netvirt-csit-3node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-3node-openstack-ocata-gate-stateful-{stream}