Merge "Add pike combo to carbon and nitrogen 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 3dcfffb4059e962697b56dcc426334bb4a375104..3d9bb99420c5b9f7f3f11e7d9f9ce15576aca57b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
@@ -24,7 +27,6 @@
     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},
@@ -35,8 +37,8 @@
 
       - 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}