Browse Source

Align other tox-based project-config publish jobs

Make all of the tox-based project-config publish jobs set tox_envlist in
the job definition and use the shared run playbook. Ensure all of them
are set final: true.

Put the git changed check into tox.ini rather than the job
config.

Move the fetching if ical data into the post playbook, not the run playbook.

Change-Id: Icc69781a50bf3e131baa20f0d4ef9cb95929a390
changes/86/509886/1
Monty Taylor 4 years ago
parent
commit
fb68fc9d7b
No known key found for this signature in database GPG Key ID: 7BAE94BC7141A594
  1. 9
      playbooks/check-main-yaml/run.yaml
  2. 4
      playbooks/docs-infra-index/run.yaml
  3. 9
      playbooks/yaml2ical/post.yaml
  4. 13
      playbooks/yaml2ical/run.yaml
  5. 8
      tox.ini
  6. 9
      zuul.d/jobs.yaml

9
playbooks/check-main-yaml/run.yaml

@ -1,9 +0,0 @@
- hosts: all
roles:
- role: tox
tox_envlist: add-projects-to-main
- hosts: all
tasks:
- name: Check for changes to zuul/main.yaml
command: git diff-files --quiet

4
playbooks/docs-infra-index/run.yaml

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

9
playbooks/yaml2ical/post.yaml

@ -1,3 +1,12 @@
- hosts: all
tasks:
- name: Collect yaml2ical output
synchronize:
dest: "{{ zuul.executor.work_root }}/yaml2ical"
mode: pull
src: "src/{{ zuul.project.canonical_name }}/output"
verify_host: true
- hosts: localhost
roles:
- add-fileserver

13
playbooks/yaml2ical/run.yaml

@ -1,13 +0,0 @@
- hosts: all
roles:
- role: tox
tox_envlist: ical
post_tasks:
- name: Collect yaml2ical output
synchronize:
dest: "{{ zuul.executor.work_root }}/yaml2ical"
mode: pull
src: "src/{{ zuul.project.canonical_name }}/output"
verify_host: true

8
tox.ini

@ -118,6 +118,10 @@ commands = nodepool -c {toxinidir}/nodepool/nodepool.yaml config-validate
[testenv:add-projects-to-main]
basepython = python3
whitelist_externals =
git
deps =
ruamel.yaml
commands = python tools/add-projects-to-main.py
ruamel.yaml
commands =
python tools/add-projects-to-main.py
git diff-files --quiet

9
zuul.d/jobs.yaml

@ -263,8 +263,10 @@
Publish the IRC meeting calendars to eavesdrop.openstack.org.
final: True
pre-run: playbooks/yaml2ical/pre
run: playbooks/yaml2ical/run
run: playbooks/project-config/run-tox
post-run: playbooks/yaml2ical/post
vars:
tox_envlist: ical
secrets:
- name: fileserver
secret: eavesdrop_ssh_key
@ -431,10 +433,13 @@
- job:
name: project-config-check-main-yaml
pre-run: playbooks/check-main-yaml/pre
run: playbooks/check-main-yaml/run
run: playbooks/project-config/run-tox
post-run: playbooks/check-main-yaml/post
allowed-projects:
- openstack-infra/project-config
final: true
vars:
tox_envlist: add-projects-to-main
files:
- zuul/main.yaml
- gerrit/projects.yaml

Loading…
Cancel
Save