Merge "Move {name}-docs to ubuntu-xenial"

jenkins/jobs/openstack-publish-jobs.yaml

@@ -1,6 +1,6 @@
 - job-template:
-    name: '{name}-docs'
-    node: ubuntu-trusty
+    name: '{name}-docs-{node}'
+    node: '{node}'
 
     builders:
       - print-template-name:
@@ -143,7 +143,10 @@
 - job-group:
     name: openstack-publish-jobs
     jobs:
-      - '{name}-docs'
+      - '{name}-docs-{node}':
+    node:
+      - ubuntu-trusty
+      - ubuntu-xenial
 
 - job-group:
     name: openstack-client-publish-jobs

zuul/layout.yaml

@@ -591,9 +591,11 @@ project-templates:
 
   - name: openstack-server-publish-jobs
     post:
-      - '{name}-docs'
+      - '{name}-docs-ubuntu-trusty'
+      - '{name}-docs-ubuntu-xenial'
     release:
-      - '{name}-docs'
+      - '{name}-docs-ubuntu-trusty'
+      - '{name}-docs-ubuntu-xenial'
 
   - name: openstack-client-publish-jobs
     release:
@@ -3238,13 +3240,16 @@ projects:
     check:
       - gate-hacking-integration-nova
     post:
-      - hacking-docs
+      - hacking-docs-ubuntu-trusty
+      - hacking-docs-ubuntu-xenial
       - hacking-coverage-ubuntu-trusty
       - hacking-coverage-ubuntu-xenial
     pre-release:
-      - hacking-docs
+      - hacking-docs-ubuntu-trusty
+      - hacking-docs-ubuntu-xenial
     release:
-      - hacking-docs
+      - hacking-docs-ubuntu-trusty
+      - hacking-docs-ubuntu-xenial
 
   - name: openstack-dev/heat-cfnclient
     template:
@@ -3301,11 +3306,14 @@ projects:
     post:
       - pbr-coverage-ubuntu-trusty
       - pbr-coverage-ubuntu-xenial
-      - pbr-docs
+      - pbr-docs-ubuntu-trusty
+      - pbr-docs-ubuntu-xenial
     pre-release:
-      - pbr-docs
+      - pbr-docs-ubuntu-trusty
+      - pbr-docs-ubuntu-xenial
     release:
-      - pbr-docs
+      - pbr-docs-ubuntu-trusty
+      - pbr-docs-ubuntu-xenial
 
   - name: openstack-dev/sandbox
     template:
@@ -4591,7 +4599,8 @@ projects:
       - name: python35-db-jobs-nv
       - name: release-notes-jobs
     post:
-      - subunit2sql-docs
+      - subunit2sql-docs-ubuntu-trusty
+      - subunit2sql-docs-ubuntu-xenial
 
   - name: openstack-infra/system-config
     template:
@@ -7659,7 +7668,8 @@ projects:
     post:
       - heat-cfntools-branch-tarball
     release:
-      - heat-cfntools-docs
+      - heat-cfntools-docs-ubuntu-trusty
+      - heat-cfntools-docs-ubuntu-xenial
 
   - name: openstack/heat-specs
     template:
@@ -10257,7 +10267,8 @@ projects:
       - name: python35-jobs-nv
       - name: check-tripleo-jobs
     post:
-      - os-cloud-config-docs
+      - os-cloud-config-docs-ubuntu-trusty
+      - os-cloud-config-docs-ubuntu-xenial
       - os-cloud-config-coverage-ubuntu-trusty
       - os-cloud-config-coverage-ubuntu-xenial
 
@@ -10877,7 +10888,8 @@ projects:
       - name: merge-check
       - name: python-jobs
     post:
-      - performance-docs-docs
+      - performance-docs-docs-ubuntu-trusty
+      - performance-docs-docs-ubuntu-xenial
 
   - name: openstack/poppy
     template:
@@ -11922,7 +11934,8 @@ projects:
       - python-heatclient-coverage-ubuntu-trusty
       - python-heatclient-coverage-ubuntu-xenial
     release:
-      - python-heatclient-docs
+      - python-heatclient-docs-ubuntu-trusty
+      - python-heatclient-docs-ubuntu-xenial
 
   - name: openstack/python-ironic-inspector-client
     template:
@@ -13777,7 +13790,8 @@ projects:
       - gate-tempest-dsvm-ironic-parallel-nv
       - gate-tempest-dsvm-nova-v20-api
     post:
-      - tempest-docs
+      - tempest-docs-ubuntu-trusty
+      - tempest-docs-ubuntu-xenial
       - tempest-coverage-ubuntu-trusty
       - tempest-coverage-ubuntu-xenial
       - tempest-branch-tarball
@@ -13824,7 +13838,8 @@ projects:
       - name: python35-jobs-nv
       - name: release-notes-jobs
     post:
-      - tempest-lib-docs
+      - tempest-lib-docs-ubuntu-trusty
+      - tempest-lib-docs-ubuntu-xenial
 
   - name: openstack/tempest-plugin-cookiecutter
     template:
@@ -13969,7 +13984,8 @@ projects:
       - gate-tripleo-docs-docs-ubuntu-trusty
       - gate-tripleo-docs-docs-ubuntu-xenial
     post:
-      - tripleo-docs-docs
+      - tripleo-docs-docs-ubuntu-trusty
+      - tripleo-docs-docs-ubuntu-xenial
 
   - name: openstack/tripleo-heat-templates
     template:
@@ -14011,11 +14027,14 @@ projects:
       - gate-tripleo-incubator-docs-ubuntu-trusty
       - gate-tripleo-incubator-docs-ubuntu-xenial
     post:
-      - tripleo-incubator-docs
+      - tripleo-incubator-docs-ubuntu-trusty
+      - tripleo-incubator-docs-ubuntu-xenial
     pre-release:
-      - tripleo-incubator-docs
+      - tripleo-incubator-docs-ubuntu-trusty
+      - tripleo-incubator-docs-ubuntu-xenial
     release:
-      - tripleo-incubator-docs
+      - tripleo-incubator-docs-ubuntu-trusty
+      - tripleo-incubator-docs-ubuntu-xenial
 
   - name: openstack/tripleo-puppet-elements
     template: