From 5f73b62b7095f606a73e500f6608bf7f20e007ac Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 29 Jun 2016 20:47:16 +0200 Subject: [PATCH] Fix doc publishing for infra Documents that we only publish in the release pipeline, need to get published to the top level directory as well as to a versioned subdir. Create docs-tags job for publishing of these repositories, like it was done for normal python projects. Remove the storyboard publish jobs, we can use the normal infra publish jobs for these. ci.openstack.org is not used anymore and the location http://ci.openstack.org/storyboard redirects to http://docs.openstack.org/infra/storyboard/ Also, update a misleading description. Change-Id: Ibef97f8d0c06b9f7f000872de14283e2911d3099 --- jenkins/jobs/infra-publish-jobs.yaml | 24 +++++++++++++++++++++++ jenkins/jobs/openstack-publish-jobs.yaml | 2 +- jenkins/jobs/projects.yaml | 3 +++ jenkins/jobs/python-storyboardclient.yaml | 19 ------------------ jenkins/jobs/storyboard.yaml | 20 ------------------- zuul/layout.yaml | 12 ++++++------ 6 files changed, 34 insertions(+), 46 deletions(-) delete mode 100644 jenkins/jobs/python-storyboardclient.yaml diff --git a/jenkins/jobs/infra-publish-jobs.yaml b/jenkins/jobs/infra-publish-jobs.yaml index 4e8ba230ad..5b1d513937 100644 --- a/jenkins/jobs/infra-publish-jobs.yaml +++ b/jenkins/jobs/infra-publish-jobs.yaml @@ -19,6 +19,29 @@ excludes: '' - console-log +- job-template: + name: '{name}-infra-docs-tags-only' + description: Publish infra documents, use when only publish on tag + node: ubuntu-trusty + + builders: + - print-template-name: + template-name: "{template-name}" + - gerrit-git-prep + - install-distro-packages + - revoke-sudo + - docs-tags-only-env: + env: venv + + publishers: + - ftp: + site: '{doc-publisher-site}' + source: 'doc/build/html/**' + target: 'infra/{doc-publisher-folder}' + remove-prefix: 'doc/build/html' + excludes: '' + - console-log + - job: name: publish-infra-docs-index description: Render and publish the infra docs index. @@ -58,3 +81,4 @@ name: infra-publish-jobs jobs: - '{name}-infra-docs' + - '{name}-infra-docs-tags-only' diff --git a/jenkins/jobs/openstack-publish-jobs.yaml b/jenkins/jobs/openstack-publish-jobs.yaml index 980349a9e1..59a6cd1a79 100644 --- a/jenkins/jobs/openstack-publish-jobs.yaml +++ b/jenkins/jobs/openstack-publish-jobs.yaml @@ -22,7 +22,7 @@ - job-template: name: '{name}-docs-tags-only' - description: Publish documents only to tag location + description: Publish infra documents, use when only publish on tag node: ubuntu-trusty builders: diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index d909ac890e..cf41f5fd74 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -8216,10 +8216,13 @@ - project: name: python-storyboardclient tarball-site: tarballs.openstack.org + doc-publisher-site: docs.openstack.org + doc-publisher-folder: python-storyboardclient jobs: - python-jobs - pypi-jobs + - infra-publish-jobs - project: name: python-surveilclient diff --git a/jenkins/jobs/python-storyboardclient.yaml b/jenkins/jobs/python-storyboardclient.yaml deleted file mode 100644 index 04a259ee8b..0000000000 --- a/jenkins/jobs/python-storyboardclient.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# This is a non-standard docs job because it uses SCP instead of FTP -- job: - name: python-storyboardclient-infra-docs - node: ubuntu-trusty - - builders: - - gerrit-git-prep - - install-distro-packages - - revoke-sudo - - docs - - publishers: - - scp: - site: '173.203.107.207' # ci.openstack.org - files: - - target: 'ci/python-storyboardclient' - source: 'doc/build/html/**/*' - keep-hierarchy: true - - console-log diff --git a/jenkins/jobs/storyboard.yaml b/jenkins/jobs/storyboard.yaml index 0cf8da15e0..209561b41f 100644 --- a/jenkins/jobs/storyboard.yaml +++ b/jenkins/jobs/storyboard.yaml @@ -1,23 +1,3 @@ -# This is a non-standard docs job because it uses SCP instead of FTP -- job: - name: storyboard-docs - node: ubuntu-trusty - - builders: - - gerrit-git-prep - - install-distro-packages - - revoke-sudo - - docs - - publishers: - - scp: - site: '173.203.107.207' - files: - - target: 'ci/storyboard' - source: 'doc/build/html/**/*' - keep-hierarchy: true - - console-log - - job: name: gate-storyboard-js-integration node: ubuntu-trusty diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 95ac84151f..37b40daf94 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3074,7 +3074,7 @@ projects: post: - bindep-coverage release: - - bindep-infra-docs + - bindep-infra-docs-tags-only - name: openstack-infra/bugdaystats template: @@ -3208,7 +3208,7 @@ projects: check: - gate-git-restack-python34 release: - - git-restack-infra-docs + - git-restack-infra-docs-tags-only - name: openstack-infra/git-review template: @@ -3219,7 +3219,7 @@ projects: check: - gate-git-review-python34 release: - - git-review-infra-docs + - git-review-infra-docs-tags-only - name: openstack-infra/gitdm template: @@ -4069,7 +4069,7 @@ projects: post: - python-storyboardclient-coverage release: - - python-storyboardclient-infra-docs + - python-storyboardclient-infra-docs-tags-only # TODO: add docs - name: openstack-infra/release-tools @@ -4167,9 +4167,9 @@ projects: - storyboard-branch-tarball - storyboard-coverage-db pre-release: - - storyboard-infra-docs + - storyboard-infra-docs-tags-only release: - - storyboard-infra-docs + - storyboard-infra-docs-tags-only experimental: - gate-storyboard-js-integration