From cbd19fcaea2484442fc4a4375adafeafa4bfc973 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 20 Jul 2016 21:40:31 +0200
Subject: [PATCH] Switch most manuals jobs to Xenial

Run manuals jobs on Xenial. Exception are the "normal" tox jobs, those
will be changed separately.

This change includes a revert of change
Iedbb8522c7efcbd039d8f69cb2ea3651eb272562, the testing was successful.

Change-Id: Ice96cc15de051ef1004a6e2f0e655597cabc9f3a
---
 jenkins/jobs/manuals-jobs.yaml | 33 ++++-----------------------------
 jenkins/jobs/projects.yaml     |  2 --
 zuul/layout.yaml               |  4 ----
 3 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/jenkins/jobs/manuals-jobs.yaml b/jenkins/jobs/manuals-jobs.yaml
index 04e2a4e4fa..03a4883583 100644
--- a/jenkins/jobs/manuals-jobs.yaml
+++ b/jenkins/jobs/manuals-jobs.yaml
@@ -15,7 +15,7 @@
 
 - job-template:
     name: 'gate-{name}-tox-doc-publish-{envlist}'
-    node: ubuntu-trusty
+    node: ubuntu-xenial
 
     wrappers:
       - build-timeout:
@@ -39,7 +39,7 @@
 
 - job-template:
     name: '{name}-tox-doc-{envlist}'
-    node: ubuntu-trusty
+    node: ubuntu-xenial
 
     wrappers:
       - build-timeout:
@@ -60,31 +60,6 @@
       - upload-doc-build-results
       - console-log
 
-
-- job-template:
-    name: 'gate-{name}-tox-doc-publish-{envlist}-ubuntu-xenial'
-    node: ubuntu-xenial
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - gerrit-git-prep
-      - install-distro-packages
-      - revoke-sudo
-      - tox:
-          envlist: '{envlist}'
-      - assert-no-extra-files
-
-    publishers:
-      - upload-docs-draft
-      - upload-doc-build-results
-      - console-log
-
 - job-group:
     name: openstack-doc-jobs
     jobs:
@@ -105,7 +80,7 @@
 - job-template:
     name: gate-{name}-install-guide
     description: Build and draft the Install Guide from source.
-    node: ubuntu-trusty
+    node: ubuntu-xenial
 
     builders:
       - zuul-git-prep-upper-constraints
@@ -126,7 +101,7 @@
 - job-template:
     name: '{name}-install-guide'
     description: Build and publish the Install Guide from source.
-    node: ubuntu-trusty
+    node: ubuntu-xenial
 
     builders:
       - zuul-git-prep-upper-constraints
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 97085edba9..156da9d0c7 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -5677,8 +5677,6 @@
       - openstack-releasenotes-jobs
       - manual-translation-jobs
       - translation-jobs-mitaka
-      - gate-{name}-tox-doc-publish-{envlist}-ubuntu-xenial:
-          envlist: checkbuild
 
 - project:
     name: openstack-resource-agents-specs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3afdaafb8e..338f5229fa 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1428,9 +1428,6 @@ jobs:
   - name: gate-openstack-manuals-tox-checksyntax
     branch: ^(stable/liberty).*$
 
-  - name: gate-openstack-manuals-tox-doc-publish-checkbuild-ubuntu-xenial
-    voting: false
-
   # Packstack integration jobs should only run on master and stable/mitaka
   # onwards
   - name: ^gate-packstack-integration-.*-tempest-centos-7$
@@ -9564,7 +9561,6 @@ projects:
       - name: release-notes-jobs
     check:
       - gate-openstack-manuals-tox-checksyntax
-      - gate-openstack-manuals-tox-doc-publish-checkbuild-ubuntu-xenial
     gate:
       - gate-openstack-manuals-tox-checksyntax
     post: