Merge "Make networking-generic-switch-dsvm-tempest voting"

jenkins/jobs/networking-generic-switch.yaml

@@ -87,12 +87,6 @@
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_TENANT_NETWORK_TYPE=vlan"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"TENANT_VLAN_RANGE=100:150"
 
-          function post_test_hook {{
-                source $BASE/new/devstack/openrc admin admin
-                sudo -E -u stack $BASE/new/networking-generic-switch/devstack/exercise.sh
-          }}
-          export -f post_test_hook
-
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 

jenkins/jobs/projects.yaml

@@ -4634,7 +4634,7 @@
       - '{pipeline}-networking-generic-switch-dsvm-tempest{job-suffix}':
           pipeline: gate
           node: ubuntu-xenial
-          job-suffix: '-nv'
+          job-suffix: ''
           branch-override: default
 
 - project:

zuul/layout.yaml

@@ -9026,9 +9026,10 @@ projects:
       - name: publish-to-pypi
     check:
       - gate-networking-generic-switch-dsvm
-      - gate-networking-generic-switch-dsvm-tempest-nv
+      - gate-networking-generic-switch-dsvm-tempest
     gate:
       - gate-networking-generic-switch-dsvm
+      - gate-networking-generic-switch-dsvm-tempest
 
   - name: openstack/networking-hpe
     template: