From: Sam Hague <shague@redhat.com>
Date: Tue, 17 Jul 2018 13:51:27 +0000 (-0400)
Subject: Use new flex option in netvirt patch-test
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4a8ed7d08656361544828cd2a4b72e2747cdc9ca;hp=d810f291425aa4b8774f689c07955561cae57b33;p=releng%2Fbuilder.git

Use new flex option in netvirt patch-test

Change-Id: Id0b15e2cfcf720ff685d07a205a598dbb4a99adf
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 6d6f192dd5..2f3bc4087e 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -69,6 +69,7 @@
     os-cmb-cnt: 1
     os-ctl-cnt: 0
     os-cmp-cnt: 0
+    os-std-topo: '0cmb-1ctl-2cmp'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index c8b6ef3307..354b441520 100644
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -19,15 +19,15 @@
     feature:
       - 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}
 
       - netvirt-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}
 
       - genius:
           csit-list: >
diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index f6d92eeff9..e9f0dfc97e 100644
--- 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}
       - 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}