Merge "Remove netvirt nitrogen 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 dd876aed207854d2b40d8bc6c12d8be949f7332b..d9369a1096f1a5b808cb701a5a153e91b72868bb 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -9,22 +9,12 @@
 
     # 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'
-      - 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: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
 
     jdk: 'openjdk8'