Remove now obsolete publish-jobs

Since openstack-manuals, api-guide, api-ref, and openstack-tox-docs are
now publishing via promote jobs, the publish jobs are not needed
anymore, remove them and the playbooks they used.

Note that publish-openstack-tox-docs is used in a few places, update one
here (requirements) and mark the job as deprecated. Before this one can
be removed, update all users.

Remove the now unused afsdeveloper_secret as well.

Depends-On: https://review.opendev.org/677009
Change-Id: Id8069557d0cf788e6eb469c8141945f89ac462e6
This commit is contained in:
Andreas Jaeger 2019-08-16 20:33:09 +02:00
parent 5057150eef
commit 33b31e5775
5 changed files with 4 additions and 176 deletions

View File

@ -1,20 +0,0 @@
- hosts: all
roles:
- role: write-root-marker
when: zuul_success | bool
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool
- hosts: localhost
roles:
- role: set-service-type-data-fact
when: zuul_success | bool
- role: create-afs-token
when: zuul_success | bool
- role: upload-afs
afs_target: "{{ afs.path }}/{{ api_path }}/{{ service_type_data.service_type }}"
when: zuul_success | bool
- role: destroy-afs-token
when: zuul_success | bool

View File

@ -1,7 +0,0 @@
- hosts: all
roles:
- fetch-tox-output
- role: fetch-sphinx-output
sphinx_output_src: "{{ zuul.project.src_dir }}/publish-docs/html/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -289,6 +289,8 @@
basename of the branch like pike (for stable/pike).
This is the publication job for ``openstack-tox-docs``.
This is deprecated, use ``promote-openstack-tox-docs`` instead.
final: true
post-run:
- playbooks/sphinx/post.yaml
@ -683,51 +685,6 @@
vars:
static_target: security
- job:
name: publish-openstack-manuals-base
description: |
Base job to publish manual related documents. These build jobs
invoke a tox command and expect the published content to be in
publish-docs directory. This content is published on the root of
the website.
Note that this build job does not create a root-marker file,
this has to be done by scripts called from tox.
nodeset: ubuntu-bionic
pre-run: playbooks/project-config/pre-tox.yaml
run: playbooks/project-config/run-tox.yaml
roles:
- zuul: zuul/zuul-jobs
- zuul: openstack/openstack-zuul-jobs
# Syncing to AFS can take longer than default 30 mins
post-timeout: 3600
vars:
tox_envlist: publishdocs
tox_environment:
# The tox job writes the root-marker file directly and thus
# needs the following variables set:
ZUUL_PROJECT: '{{ zuul.project.name }}'
ZUUL_BRANCH: '{{ zuul.branch }}'
ZUUL_UUID: '{{ zuul.build }}'
ZUUL_NEWREF: '{{ zuul.ref }}'
- job:
name: publish-openstack-manuals
parent: publish-openstack-manuals-base
final: true
post-run:
- playbooks/publish/manuals.yaml
- playbooks/publish/openstack-afs.yaml
allowed-projects:
- openstack/openstack-manuals
- openstack/security-doc
- openstack/training-guides
vars:
afs_subpath: ""
secrets:
- secret: afsdocs_secret
name: afs
- job:
name: promote-openstack-manuals
description: |
@ -783,88 +740,6 @@
name: afs
pass-to-parent: true
- job:
name: publish-openstack-manuals-developer
parent: publish-openstack-manuals-base
post-run:
- playbooks/publish/manuals.yaml
- playbooks/publish/openstack-afs.yaml
final: true
allowed-projects:
- openstack/api-site
vars:
afs_subpath: ""
secrets:
- secret: afsdeveloper_secret
name: afs
- job:
name: publish-openstack-manuals-lang
parent: publish-openstack-manuals-base
post-run:
- playbooks/publish/manuals.yaml
- playbooks/publish/openstack-afs.yaml
final: true
allowed-projects:
- openstack/openstack-manuals
- openstack/security-doc
vars:
tox_envlist: publishlang
afs_subpath: ""
secrets:
- secret: afsdocs_secret
name: afs
- job:
name: publish-api-tox-docs-base
description: |
Base job for publishing api-guide and api-ref jobs to docs site.
# We only publish the master branch, so no need to run
# for changes on other branches.
branches: master
abstract: true
protected: true
pre-run: playbooks/project-config/pre-tox.yaml
run: playbooks/project-config/run-tox.yaml
post-run:
- playbooks/project-config/post-tox.yaml
- playbooks/publish/api-docs.yaml
required-projects:
- name: openstack/requirements
roles:
- zuul: zuul/zuul-jobs
- zuul: openstack/openstack-zuul-jobs
vars:
bindep_profile: compile doc
tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
secrets:
- secret: afsdocs_secret
name: afs
- job:
name: publish-api-guide
parent: publish-api-tox-docs-base
description: |
Publish api-guide document to
https://docs.openstack.org/api-guide.
final: true
vars:
sphinx_build_dir: api-guide/build
tox_envlist: api-guide
api_path: api-guide
- job:
name: publish-api-ref
parent: publish-api-tox-docs-base
description: |
Publish api-ref document to
https://docs.openstack.org/api-ref.
final: true
vars:
sphinx_build_dir: api-ref/build
tox_envlist: api-ref
api_path: api-ref
- job:
name: promote-api-guide
parent: opendev-promote-docs-base

View File

@ -4358,9 +4358,9 @@
jobs:
- openstack-tox-docs:
branches: master
post:
promote:
jobs:
- publish-openstack-tox-docs:
- promote-openstack-tox-docs:
branches: master
periodic:
jobs:

View File

@ -60,26 +60,6 @@
docs_branch_path: "/afs/.openstack.org/docs/{{ zuul.project.name }}/{{ zuul.branch | default('_error') }}"
docs_tag_path: "/afs/.openstack.org/docs/{{ zuul.project.name }}/{{ zuul.tag | default('_error') }}"
- secret:
name: afsdeveloper_secret
# Same secrete as afsdocs_secret but uses path for publishing to
# developers.openstack.org.
data:
keytab: !encrypted/pkcs1-oaep
- n+axpDtVoZKfH8i1LgIcBtIAse9eYKCthb+I8d5Jw6SnoN3/TZyu/fDKeteeHIroAUacV
syO2zQQG6aTOKP6kFILz1DzTcujIrjIQnYLZDrLLL0d384r/Opz2+A6mdM7B2tsgGbtI9
rgsh1TjBrcJinGaJZRcLKI+ZRWjkN1+0AwPYJYSsP20xNDa4jeKKnPKrEn8KphpFJe4y8
aYwvLpwV/4li/pko6MII7rCwmU3lcmTFKXVIwq2RHozLNcsxoFeT4182ye8gPOjmmuin9
RHaZ7UJA55JkgwmxJwR9cG+CTH5N2678cCzLuXyve0fRDrDTCsEDxxwh2Xm3F8PQAlbPR
OWMFvXcjlXYaMJ1Ne7yMOq1diFF9ZsqgnwNlGhju3EMCxKOZ0GBVp96DwFGj6rgaOVsSu
BczPoy7W5BCXuWQsZBxhReFEMs3muaWVPqya5fRZXylZlMnOI6xh3Yij3uZV5Nxrg0uJK
sDBrgIZFKQNWfvzFqaxjZPMsRRNmXZVeHpEy1WlkT5PN4jJn7+B6qo4iudPnCmMySzk4X
eTxHgwr8HS4uBvqLoKRZGMDXwl2abB2vEkIrlW41HVqpHOqGXLniGf7tEDIKb1pmrPe/P
OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
path: /afs/.openstack.org/developer-docs
# TODO(pabelanger): Update AFS credentials to say zuul-executor.
service_name: service/zuul-launcher@OPENSTACK.ORG
- secret:
# Same secret as afsdocs_secret but different data for publishing to
# developer.openstack.org