Create Fluorine jobs and bump Oxygen branch

[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 034eced4f5067de3f1ea9327ee42a46b2f8f81bd..e52dc48d9f53ef3b367335d03176680040654def 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -2,36 +2,44 @@
 - project:
     name: openflowplugin-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - carbon:
+      - fluorine:
           branch: 'master'
-          jdk: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
+          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'
+
+    jdk: 'openjdk8'
 
     feature:
       - core:
           csit-list: >
-              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-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-periodic-gate-bulkomatic-clustering-daily-only-{stream},
-              openflowplugin-csit-3node-periodic-gate-bulkomatic-clustering-perf-daily-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}