Update specs-site and infra-index publication jobs

They were both not fetching the same venv they were building with.

Rather than repeat ourselves, we can update these to share a run
playbook - and can pass tox_envlist from the job rather than needing
playbooks that set that themselves. That also allows fetch-tox-output to
pick it up.

Change-Id: Iefec8c50418dcea00c3adebdc20b71c7f20241bd
This commit is contained in:
Monty Taylor 2017-10-05 14:18:49 -05:00
parent 5dc258d467
commit 2ecf933833
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
3 changed files with 9 additions and 11 deletions

View File

@ -0,0 +1,3 @@
- hosts: all
roles:
- tox

View File

@ -1,4 +0,0 @@
- hosts: all
roles:
- role: tox
tox_envlist: specs

View File

@ -167,15 +167,13 @@
Publish OpenStack specs site to static.openstack.org specs/ Publish OpenStack specs site to static.openstack.org specs/
final: True final: True
pre-run: playbooks/python-docs/pre pre-run: playbooks/python-docs/pre
run: playbooks/specs-site/run run: playbooks/project-config/run-tox
post-run: playbooks/publish/openstack-specs-site post-run: playbooks/publish/openstack-specs-site
required-projects:
- name: openstack/requirements
roles: roles:
- zuul: openstack-infra/zuul-jobs - zuul: openstack-infra/zuul-jobs
- zuul: openstack-infra/openstack-zuul-jobs - zuul: openstack-infra/openstack-zuul-jobs
vars: vars:
tox_constraints_file: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt" tox_envlist: specs
secrets: secrets:
- site_logs - site_logs
@ -237,14 +235,15 @@
Publish the infrastructure documentation index Publish the infrastructure documentation index
final: True final: True
pre-run: playbooks/python-docs/pre pre-run: playbooks/python-docs/pre
run: playbooks/docs-infra-index/run run: playbooks/project-config/run-tox
post-run: post-run: playbooks/publish/infra-index
- playbooks/publish/infra-index
allowed-projects: allowed-projects:
- openstack-infra/project-config - openstack-infra/project-config
roles: roles:
- zuul: openstack-infra/zuul-jobs - zuul: openstack-infra/zuul-jobs
- zuul: openstack-infra/openstack-zuul-jobs - zuul: openstack-infra/openstack-zuul-jobs
vars:
tox_envlist: infra-docs
secrets: secrets:
- secret: afsdocs_secret - secret: afsdocs_secret
name: afs name: afs