Merge "Use Jenkins templates for old manual jobs"

modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml

@@ -60,3 +60,79 @@
           target: '/'
           remove-prefix: 'doc/install-guide/target/docbkx/webhelp/'
           excludes: '**/*.xml,**/null*'
+
+- job-template:
+    name: openstack-{oldmanual}-old
+    project-type: maven
+    node: precise
+    concurrent: false
+
+    prebuilders:
+      - gerrit-git-prep
+
+    properties:
+      - inject:
+          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
+          properties-file: gerrit-doc.properties
+
+    maven:
+      maven-name: Maven3
+      root-module:
+        group-id: org.openstack.docs
+        artifact-id: openstack-guide
+      root-pom: doc/src/docbkx/openstack-{oldmanual}/pom.xml
+      goals: '-Drelease.path.name=${{DOC_RELEASE_PATH}} -Dcomments.enabled=${{DOC_COMMENTS_ENABLED}} clean generate-sources -B'
+
+    publishers:
+      - console-log
+      - ftp:
+          site: docs.openstack.org
+          source: 'doc/src/docbkx/openstack-{oldmanual}/target/docbkx/webhelp/**'
+          target: '/'
+          remove-prefix: 'doc/src/docbkx/openstack-{oldmanual}/target/docbkx/webhelp/'
+          excludes: '**/*.xml,**/null*'
+      - ftp:
+          site: docs.openstack.org
+          source: 'doc/src/docbkx/openstack-{oldmanual}/target/docbkx/webhelp/**/atom.xml'
+          target: '/'
+          remove-prefix: 'doc/src/docbkx/openstack-{oldmanual}/target/docbkx/webhelp/'
+
+- job-template:
+    name: openstack-{install}-{distribution}-old
+    project-type: maven
+    node: precise
+    concurrent: false
+
+    prebuilders:
+      - gerrit-git-prep
+
+    properties:
+      - inject:
+          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
+          properties-file: gerrit-doc.properties
+
+    prebuilders:
+      - gerrit-git-prep
+
+    maven:
+      maven-name: Maven3
+      root-module:
+        group-id: org.openstack.docs
+        artifact-id: openstack-guide
+      root-pom: doc/src/docbkx/{install}/pom.xml
+      goals: '-Doperating.system={system} -Dprofile.os={profileos} -Drelease.path.name=${{DOC_RELEASE_PATH}} -Dcomments.enabled=${{DOC_COMMENTS_ENABLED}} clean generate-sources -B'
+
+    publishers:
+      - console-log
+      - ftp:
+          site: docs.openstack.org
+          source: 'doc/src/docbkx/{install}/target/docbkx/webhelp/**'
+          target: ''
+          remove-prefix: 'doc/src/docbkx/{install}/target/docbkx/webhelp/'
+          excludes: '**/*.xml,**/null*'
+      - ftp:
+          site: docs.openstack.org
+          source: 'doc/src/docbkx/{install}/target/docbkx/webhelp/**/atom.xml'
+          target: ''
+          remove-prefix: 'doc/src/docbkx/{install}/target/docbkx/webhelp/'
+

modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml

@@ -35,170 +35,6 @@
     publishers:
       - console-log
 
-# in zuul/layout.yaml specified to only run against stable/folsom and grizzly
-# branches.
-- job:
-    name: openstack-basic-install-fedora-old
-    project-type: maven
-    node: precise
-
-    properties:
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
-          properties-file: gerrit-doc.properties
-
-    prebuilders:
-      - gerrit-git-prep
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/src/docbkx/basic-install/pom.xml
-      goals: '-Doperating.system=yum -Dprofile.os=centos;fedora;rhel -Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources -B'
-
-    publishers:
-      - console-log
-      - ftp:
-          site: docs.openstack.org
-          source: 'doc/src/docbkx/basic-install/target/docbkx/webhelp/**'
-          target: ''
-          remove-prefix: 'doc/src/docbkx/basic-install/target/docbkx/webhelp/'
-          excludes: '**/*.xml,**/null*'
-
-
-# in zuul/layout.yaml specified to only run against stable/folsom and grizzly
-# branches.
-- job:
-    name: openstack-basic-install-ubuntu-old
-    project-type: maven
-    node: precise
-
-    prebuilders:
-      - gerrit-git-prep
-
-    properties:
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
-          properties-file: gerrit-doc.properties
-
-    prebuilders:
-      - gerrit-git-prep
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/src/docbkx/basic-install/pom.xml
-      goals: '-Doperating.system=apt -Dprofile.os=ubuntu;debian -Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources -B'
-
-    publishers:
-      - console-log
-      - ftp:
-          site: docs.openstack.org
-          source: 'doc/src/docbkx/basic-install/target/docbkx/webhelp/**'
-          target: ''
-          remove-prefix: 'doc/src/docbkx/basic-install/target/docbkx/webhelp/'
-          excludes: '**/*.xml,**/null*'
-
-- job:
-    name: openstack-admin-manual-block-old
-    project-type: maven
-    node: precise
-
-    prebuilders:
-      - gerrit-git-prep
-
-    properties:
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
-          properties-file: gerrit-doc.properties
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/src/docbkx/openstack-block-storage-admin/pom.xml
-      goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources -B'
-
-    publishers:
-      - console-log
-      - ftp:
-          site: docs.openstack.org
-          source: 'doc/src/docbkx/openstack-block-storage-admin/target/docbkx/webhelp/**'
-          target: '/'
-          remove-prefix: 'doc/src/docbkx/openstack-block-storage-admin/target/docbkx/webhelp/'
-          excludes: '**/*.xml,**/null*'
-
-# in zuul/layout.yaml specified to only run against stable/folsom and grizzly
-# branches.
-- job:
-    name: openstack-admin-manual-compute-old
-    project-type: maven
-    concurrent: false
-    node: precise
-
-    prebuilders:
-      - gerrit-git-prep
-
-    properties:
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
-          properties-file: gerrit-doc.properties
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/src/docbkx/openstack-compute-admin/pom.xml
-      goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources -B'
-
-    publishers:
-      - console-log
-      - ftp:
-          site: docs.openstack.org
-          source: 'doc/src/docbkx/openstack-compute-admin/target/docbkx/webhelp/**'
-          target: '/'
-          remove-prefix: 'doc/src/docbkx/openstack-compute-admin/target/docbkx/webhelp/'
-          excludes: '**/*.xml,**/null*'
-
-# in zuul/layout.yaml specified to only run against stable/folsom and grizzly
-# branches.
-- job:
-    name: openstack-admin-manual-netconn-old
-    project-type: maven
-    concurrent: false
-    node: precise
-
-    prebuilders:
-      - gerrit-git-prep
-
-    properties:
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
-          properties-file: gerrit-doc.properties
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/src/docbkx/openstack-network-connectivity-admin/pom.xml
-      goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources -B'
-
-    publishers:
-      - console-log
-      - ftp:
-          site: docs.openstack.org
-          source: 'doc/src/docbkx/openstack-network-connectivity-admin/target/docbkx/webhelp/**'
-          target: '/'
-          remove-prefix: 'doc/src/docbkx/openstack-network-connectivity-admin/target/docbkx/webhelp/'
-          excludes: '**/*.xml,**/null*'
-
 # in zuul/layout.yaml specified to only run against master branch.
 - job:
     name: openstack-docs-site
@@ -256,73 +92,6 @@
           remove-prefix: 'doc/high-availability-guide/target/docbkx/webhelp/'
           excludes: '**/*.xml,**/null*'
 
-
-# in zuul/layout.yaml specified to only run against stable/folsom and grizzly
-# branches.
-- job:
-    name: openstack-install-deploy-guide-fedora-old
-    project-type: maven
-    concurrent: false
-    node: precise
-
-    properties:
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
-          properties-file: gerrit-doc.properties
-
-    prebuilders:
-      - gerrit-git-prep
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/src/docbkx/openstack-install/pom.xml
-      goals: '-Doperating.system=yum -Dprofile.os=centos;fedora;rhel -Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources -B'
-
-    publishers:
-      - console-log
-      - ftp:
-          site: docs.openstack.org
-          source: 'doc/src/docbkx/openstack-install/target/docbkx/webhelp/**'
-          target: '/'
-          remove-prefix: 'doc/src/docbkx/openstack-install/target/docbkx/webhelp/'
-          excludes: '**/*.xml,**/null*'
-
-# in zuul/layout.yaml specified to only run against stable/folsom and grizzly
-# branches.
-- job:
-    name: openstack-install-deploy-guide-ubuntu-old
-    project-type: maven
-    concurrent: false
-    node: precise
-
-    properties:
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
-          properties-file: gerrit-doc.properties
-
-    prebuilders:
-      - gerrit-git-prep
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/src/docbkx/openstack-install/pom.xml
-      goals: '-Doperating.system=apt -Dprofile.os=ubuntu -Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources -B'
-
-    publishers:
-      - console-log
-      - ftp:
-          site: docs.openstack.org
-          source: 'doc/src/docbkx/openstack-install/target/docbkx/webhelp/**'
-          target: '/'
-          remove-prefix: 'doc/src/docbkx/openstack-install/target/docbkx/webhelp/'
-          excludes: '**/*.xml,**/null*'
-
 - job:
     name: openstack-operations-guide
     project-type: maven

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -1407,12 +1407,14 @@
       - user-guide
       - user-guide-admin
 
+    oldmanual:
+        - block-storage-admin
+        - compute-admin
+        - network-connectivity-admin
+
     jobs:
       - 'openstack-{manual}'
 
-- project:
-    name: install-manuals
-    jobs:
       - openstack-install-deploy-guide-{distribution}:
           distribution: fedora
           system: yum
@@ -1428,6 +1430,34 @@
           system: apt
           profileos: "ubuntu"
 
+      # in zuul/layout.yaml specified to only run against
+      # stable/folsom and grizzly branches.
+      - 'openstack-{oldmanual}-old'
+
+      - openstack-{install}-{distribution}-old:
+          install: basic-install
+          distribution: fedora
+          system: yum
+          profileos: "centos;fedora;rhel"
+
+      - openstack-{install}-{distribution}-old:
+          install: basic-install
+          distribution: ubuntu
+          system: apt
+          profileos: "ubuntu;debian"
+
+      - openstack-{install}-{distribution}-old:
+          install: openstack-install
+          distribution: fedora
+          system: yum
+          profileos: "centos;fedora;rhel"
+
+      - openstack-{install}-{distribution}-old:
+          install: openstack-install
+          distribution: ubuntu
+          system: yum
+          profileos: "ubuntu"
+
 - project:
     name: manila
     github-org: stackforge

modules/openstack_project/files/zuul/layout.yaml

@@ -208,19 +208,19 @@ jobs:
   - name: openstack-install-deploy-guide-ubuntu
     branch: ^(?!stable/(folsom|grizzly)).*$
 # Deprecated documentation targets:
-  - name: openstack-admin-manual-block-old
+  - name: openstack-block-storage-admin-old
     branch: stable/(grizzly|folsom)
-  - name: openstack-admin-manual-compute-old
+  - name: openstack-compute-admin-old
     branch: stable/(grizzly|folsom)
-  - name: openstack-admin-manual-netconn-old
+  - name: openstack-network-connectivity-admin-old
     branch: stable/(grizzly|folsom)
   - name: openstack-basic-install-fedora-old
     branch: stable/(grizzly|foslom)
   - name: openstack-basic-install-ubuntu-old
     branch: stable/(grizzly|folsom)
-  - name: openstack-install-deploy-guide-fedora-old
+  - name: openstack-openstack-install-fedora-old
     branch: stable/(grizzly|folsom)
-  - name: openstack-install-deploy-guide-ubuntu-old
+  - name: openstack-openstack-install-ubuntu-old
     branch: stable/(grizzly|folsom)
   - name: ^gate-.*-docs$
     success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/doc/build/html/
@@ -2023,9 +2023,9 @@ projects:
       - gate-openstack-manuals-validate
     post:
       - openstack-admin-guide-cloud
-      - openstack-admin-manual-compute-old
+      - openstack-block-storage-admin-old
-      - openstack-admin-manual-netconn-old
+      - openstack-compute-admin-old
-      - openstack-admin-manual-block-old
+      - openstack-network-connectivity-admin-old
       - openstack-basic-install-fedora-old
       - openstack-basic-install-ubuntu-old
       - openstack-glossary
@@ -2034,10 +2034,10 @@ projects:
       - openstack-docs-site
       - openstack-ha-guide
       - openstack-install-deploy-guide-fedora
-      - openstack-install-deploy-guide-fedora-old
+      - openstack-openstack-install-fedora-old
       - openstack-install-deploy-guide-opensuse
       - openstack-install-deploy-guide-ubuntu
-      - openstack-install-deploy-guide-ubuntu-old
+      - openstack-openstack-install-ubuntu-old
       - openstack-security-guide
       - openstack-user-guide
       - openstack-user-guide-admin