Merge "Revert OpenJDK 10/11 install thru local builder"

[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 a4cc536712423a390c9f06f01caf8f611e338a8d..1aa204505871cf55708c6d13c67980443aa23398 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -7,15 +7,19 @@
     project: 'netvirt'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
+          disable-job: true
 
     jdk: 'openjdk8'
 
@@ -43,7 +47,7 @@
               netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tdd-wip-{stream}
       - coe:
           csit-list: >
-              coe-csit-1node-container-networking-all-{stream}
+              coe-csit-1node-gate-container-networking-only-{stream}
       - itm-direct-tunnels:
           csit-list: >
               netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}