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
This commit is contained in:
parent
2ecf933833
commit
fb68fc9d7b
@ -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
|
|
@ -1,4 +0,0 @@
|
|||||||
- hosts: all
|
|
||||||
roles:
|
|
||||||
- role: tox
|
|
||||||
tox_envlist: infra-docs
|
|
@ -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
|
- hosts: localhost
|
||||||
roles:
|
roles:
|
||||||
- add-fileserver
|
- add-fileserver
|
||||||
|
@ -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
8
tox.ini
@ -118,6 +118,10 @@ commands = nodepool -c {toxinidir}/nodepool/nodepool.yaml config-validate
|
|||||||
|
|
||||||
[testenv:add-projects-to-main]
|
[testenv:add-projects-to-main]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
whitelist_externals =
|
||||||
|
git
|
||||||
deps =
|
deps =
|
||||||
ruamel.yaml
|
ruamel.yaml
|
||||||
commands = python tools/add-projects-to-main.py
|
commands =
|
||||||
|
python tools/add-projects-to-main.py
|
||||||
|
git diff-files --quiet
|
||||||
|
@ -263,8 +263,10 @@
|
|||||||
Publish the IRC meeting calendars to eavesdrop.openstack.org.
|
Publish the IRC meeting calendars to eavesdrop.openstack.org.
|
||||||
final: True
|
final: True
|
||||||
pre-run: playbooks/yaml2ical/pre
|
pre-run: playbooks/yaml2ical/pre
|
||||||
run: playbooks/yaml2ical/run
|
run: playbooks/project-config/run-tox
|
||||||
post-run: playbooks/yaml2ical/post
|
post-run: playbooks/yaml2ical/post
|
||||||
|
vars:
|
||||||
|
tox_envlist: ical
|
||||||
secrets:
|
secrets:
|
||||||
- name: fileserver
|
- name: fileserver
|
||||||
secret: eavesdrop_ssh_key
|
secret: eavesdrop_ssh_key
|
||||||
@ -431,10 +433,13 @@
|
|||||||
- job:
|
- job:
|
||||||
name: project-config-check-main-yaml
|
name: project-config-check-main-yaml
|
||||||
pre-run: playbooks/check-main-yaml/pre
|
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
|
post-run: playbooks/check-main-yaml/post
|
||||||
allowed-projects:
|
allowed-projects:
|
||||||
- openstack-infra/project-config
|
- openstack-infra/project-config
|
||||||
|
final: true
|
||||||
|
vars:
|
||||||
|
tox_envlist: add-projects-to-main
|
||||||
files:
|
files:
|
||||||
- zuul/main.yaml
|
- zuul/main.yaml
|
||||||
- gerrit/projects.yaml
|
- gerrit/projects.yaml
|
||||||
|
Loading…
Reference in New Issue
Block a user