Merge "Switch devstack job to centos-minimal"

jenkins/jobs/projects.yaml

@@ -1235,7 +1235,7 @@
       - '{pipeline}-tempest-dsvm-platform-{name}{job-suffix}':
           name: centos7
           pipeline: gate
-          node: devstack-centos7
+          node: centos-7
           neutron: 0
           job-suffix: '-nv'
       - '{pipeline}-tempest-dsvm-platform-{name}{job-suffix}':
@@ -1248,15 +1248,8 @@
       - '{pipeline}-tempest-dsvm-platform-{name}{job-suffix}':
           pipeline: gate
           name: centos7-neutron
-          node: devstack-centos7
-          neutron: 1
-          job-suffix: ''
-      # Experimental job for testing centos-minimal nodes
-      - '{pipeline}-tempest-dsvm-platform-{name}{job-suffix}':
-          pipeline: gate
-          name: centos7-minimal
           node: centos-7
-          neutron: 0
+          neutron: 1
           job-suffix: ''
 
 

zuul/layout.yaml

@@ -2684,7 +2684,6 @@ projects:
       - gate-dsvm-mongodb-zaqar
       - gate-grenade-dsvm-forward
       - gate-tempest-dsvm-platform-centos7-neutron
-      - gate-tempest-dsvm-platform-centos7-minimal
       - gate-tempest-dsvm-smoke-tlsproxy
     periodic:
       - propose-devstack-plugins-list