Merge "Add infrautils feature to openflowplugin CSIT"

[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 f6d92eeff98ae9888fdb67d12fdc116731b00e2f..3c7d113110beba6d23cb561b077803560c2eccb7 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -19,43 +19,43 @@
     feature:
       - current:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
       - cluster-current:
           csit-list: >
-              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
       - cluster-minimal-current:
           csit-list: >
-               netvirt-csit-3node-openstack-{os-branch}-gate-minimal-cluster-{stream}
+               netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-minimal-cluster-{stream}
       - snat-conntrack:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
       - cluster-snat-conntrack:
           csit-list: >
-              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{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}
       - tdd-wip:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-gate-tdd-wip-{stream}
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tdd-wip-{stream}
       - coe:
           csit-list: >
               coe-csit-1node-container-networking-all-{stream}
       - itm-direct-tunnels:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}
       - upgrade:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-upgrade-{stream}
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-upgrade-{stream}
       - tempest:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-gate-tempest-stateful-{stream}
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream}
       - cluster-tempest:
           csit-list: >
-              netvirt-csit-3node-openstack-{os-branch}-gate-tempest-stateful-{stream}
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream}
       - tempest-snat-conntrack:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}
       - cluster-tempest-snat-conntrack:
           csit-list: >
-              netvirt-csit-3node-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}