Use os-std-topo option in hwvtep jobs

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

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 852e0a5b957f3dd4043bedf0912e1972eeb7c1e6..dfd1d59acf6d468476c7e7a0454cc2745962bb62 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -10,37 +10,26 @@
     stream:
       - fluorine:
           branch: 'master'
-          # os-branch: 'pike'
-          # issues with pike right now (esp l2gw), lets stick with ocata
-          os-branch: 'ocata'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
-          # os-branch: 'pike'
-          # issues with pike right now (esp l2gw), lets stick with ocata
-          os-branch: 'ocata'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'ocata'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
+          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
     feature:
       - genius:
           csit-list: >
-              genius-csit-1node-genius-all-{stream}
+              genius-csit-1node-gate-all-{stream}
       - netvirt:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
       - cluster-netvirt:
           csit-list: >
-              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
       - l2gw:
           csit-list: >
-              netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
+              netvirt-csit-hwvtep-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
       - core:
           csit-list: >
               ovsdb-csit-1node-gate-southbound-all-{stream},