add core feature to ofp patch test

[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 3894e79f3b72a9befd8829ffc4d275d1927fae1a..b0b5ab004978e7173db9ef2f4e8ef1a1ac0e6457 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -1,42 +1,29 @@
 - project:
     name: openflowplugin-patch-test
     jobs:
-        - '{project}-patch-test-{stream}'
+        - '{project}-patch-test-{feature}-{stream}'
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jdk: 'openjdk8'
-            csit-list: >
-                openflowplugin-csit-1node-flow-services-only-{stream},
-                openflowplugin-csit-1node-flow-services-helium-redesign-only-{stream},
-                openflowplugin-csit-1node-flow-services-all-{stream},
-                openflowplugin-csit-1node-scalability-only-{stream},
-                openflowplugin-csit-1node-scalability-helium-redesign-only-{stream},
-                openflowplugin-csit-1node-cbench-performance-only-{stream},
-                openflowplugin-csit-1node-cbench-performance-helium-redesign-only-{stream},
-                openflowplugin-csit-1node-config-performance-only-{stream},
-                openflowplugin-csit-1node-config-performance-helium-redesign-only-{stream}
-                openflowplugin-csit-3node-clustering-only-{stream}
-                openflowplugin-csit-3node-clustering-only-helium-redesign-{stream}
-
+        - boron:
+            branch: 'stable/boron'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jdk: 'openjdk7'
+
+    feature:
+        - core:
             csit-list: >
                 openflowplugin-csit-1node-flow-services-only-{stream},
-                openflowplugin-csit-1node-flow-services-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
-                openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
-                openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
-                openflowplugin-csit-1node-config-performance-lithium-redesign-only-{stream}
                 openflowplugin-csit-3node-clustering-only-{stream}
-                openflowplugin-csit-3node-clustering-only-lithium-redesign-{stream}
-