Sphinx publishing adjustments for ubuntu-bionic
First, the publish-openstack-sphinx-docs-base job is deprecated since Rocky so should not be used for any branches which test on ubuntu-bionic nodes. As a result it's reasonable to force it to always use an ubuntu-xenial nodeset instead. Second, its replacement publish-openstack-tox-docs-base needs two variants, one which uses an ubuntu-xenial nodeset on stable/ocata through stable/rocky and another which uses the default (ubuntu-bionic) nodeset for stable/stein and later. Change-Id: If1b93c39ed978d76df4286d52d28af73ea1de574
This commit is contained in:
parent
4c974a6a22
commit
434ebab31b
|
@ -170,6 +170,7 @@
|
|||
|
||||
- job:
|
||||
name: publish-openstack-sphinx-docs-base
|
||||
nodeset: ubuntu-xenial
|
||||
description: |
|
||||
Base job for publishing sphinx documentation to
|
||||
/afs/.openstack.org/docs/.
|
||||
|
@ -237,6 +238,44 @@
|
|||
Publish the results of the docs tox job to
|
||||
/afs/.openstack.org/docs/{{ zuul.project.short_name }}.
|
||||
|
||||
branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
|
||||
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/openstack-afs.yaml
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
roles:
|
||||
- zuul: openstack-infra/zuul-jobs
|
||||
- zuul: openstack-infra/openstack-zuul-jobs
|
||||
vars:
|
||||
tox_envlist: docs
|
||||
bindep_profile: compile doc
|
||||
secrets:
|
||||
- secret: afsdocs_secret
|
||||
name: afs
|
||||
|
||||
- job:
|
||||
name: publish-openstack-tox-docs-base
|
||||
nodeset: ubuntu-xenial
|
||||
description: |
|
||||
Base job for publishing docs tox job.
|
||||
|
||||
Publish the results of the docs tox job to
|
||||
/afs/.openstack.org/docs/{{ zuul.project.short_name }}.
|
||||
|
||||
This job runs on Xenial for stable/ocata, pike, queens and rocky. This
|
||||
job is prepared to make sure all stable branches before stable/stein will
|
||||
keep running on xenial.
|
||||
|
||||
branches:
|
||||
- stable/ocata
|
||||
- stable/pike
|
||||
- stable/queens
|
||||
- stable/rocky
|
||||
abstract: true
|
||||
protected: true
|
||||
pre-run: playbooks/project-config/pre-tox.yaml
|
||||
|
|
Loading…
Reference in New Issue