Merge "Create gate-infra-puppet-apply-dsvm-{ostype}"

jenkins/jobs/infra.yaml

@@ -88,10 +88,8 @@
     publishers:
       - zuul-swift-upload-console-log
 
-- job-template:
-    name: 'gate-infra-puppet-apply-{ostype}'
-    node: '{ostype}'
-
+- builder:
+    name: infra-puppet-apply
     builders:
       - shell: |
           #!/bin/bash -xe
@@ -99,10 +97,27 @@
           cd openstack-infra/system-config
           ./tools/apply-test.sh
 
+- job-template:
+    name: 'gate-infra-puppet-apply-{ostype}'
+    node: '{ostype}'
+
+    builders:
+      - infra-puppet-apply
+
     publishers:
       - zuul-swift-upload-logs-with-console:
           upload_source: 'openstack-infra/system-config/applytest/*'
 
+- job-template:
+    name: 'gate-infra-puppet-apply-dsvm-{ostype}'
+    node: 'devstack-{ostype}'
+
+    builders:
+      - infra-puppet-apply
+
+    publishers:
+      - zuul-swift-upload-logs-with-console:
+          upload_source: 'applytest/*'
 
 - job-template:
     name: 'gate-openstackci-beaker-{ostype}-dsvm'

jenkins/jobs/projects.yaml

@@ -4103,8 +4103,10 @@
             - bare-precise
             - bare-trusty
             - bare-centos6
-            - devstack-centos7
-            - devstack-f21
+      - gate-infra-puppet-apply-dsvm-{ostype}:
+          ostype:
+            - centos7
+            - f21
       - infra-publish-jobs
       - 'gate-{name}-docs'
 

zuul/layout.yaml

@@ -531,8 +531,8 @@ project-templates:
       - gate-infra-puppet-apply-bare-precise
       - gate-infra-puppet-apply-bare-trusty
       - gate-infra-puppet-apply-bare-centos6
-      - gate-infra-puppet-apply-devstack-centos7
-      - gate-infra-puppet-apply-devstack-f21
+      - gate-infra-puppet-apply-dsvm-centos7
+      - gate-infra-puppet-apply-dsvm-f21
       - gate-openstackci-beaker-centos7-dsvm
       - gate-openstackci-beaker-trusty-dsvm
     gate:
@@ -675,7 +675,7 @@ jobs:
   - name: ^gate-openstackci-beaker-.*$
     voting: false
 
-  - name: ^gate-infra-puppet-apply-devstack-.*$
+  - name: ^gate-infra-puppet-apply-dsvm-.*$
     voting: false
 
   - name: ^gate-puppet-openstack-integration-dsvm-.*$