Merge "Remove builder docs carbon jobs"

[releng/builder.git] / jjb / netvirt / netvirt-patch-test.yaml

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 0d6c3e239d9798118ca390606a1066ebb192990b..194d2d69b6d50fcfbcad0cae4d24bc009f2e8ae1 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -9,22 +9,15 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          # ideally, master (oxygen) would gate against Queens (current master) or 'R' release
-          # bug even the pike devstack environment is still unreliable. so sticking with Ocata
-          # for now
-          os-branch: 'ocata'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
       - nitrogen:
           branch: 'stable/nitrogen'
-          # ideally, master (oxygen) would gate against Queens (current master)
-          # bug even the pike devstack environment is still unreliable. so sticking with Ocata
-          # for now
-          os-branch: 'ocata'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
+          os-branch: 'pike'
 
     jdk: 'openjdk8'
 
@@ -49,4 +42,4 @@
               netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
       - tdd-wip:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-tdd-wip-{stream}
+              netvirt-csit-1node-openstack-{os-branch}-gate-tdd-wip-{stream}