Remove explicit bindep parameters
All of these invocations of the bindep role are passing what amount to
the defaults. In zuul-jobs, doing bindep_dir: "{{ zuul_work_dir }}" is
important because it allows in-repo uses of those jobs to override how
they work for things like triggering from one repo but running on
another.
The publication jobs in project-config do not need that level of
flexibility, so just remove params and let defaults take over.
As a follow up, we could also add defaults for zuul_work_dir - and
honestly for bindep_dir - to the base job. That way we can always count
on them being set to a sane default value, and they're still
overrideable in a job.
Change-Id: I5bcda84aefa4726d0a904e8bc9698c21ca07f9a5
This commit is contained in:
committed by
Andreas Jaeger
parent
0a93ac9d16
commit
09da196701
@@ -1,8 +1,6 @@
|
|||||||
- hosts: all
|
- hosts: all
|
||||||
roles:
|
roles:
|
||||||
- role: bindep
|
- bindep
|
||||||
bindep_profile: test
|
|
||||||
bindep_dir: "{{ zuul_work_dir }}"
|
|
||||||
- test-setup
|
- test-setup
|
||||||
- install-nodejs
|
- install-nodejs
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
- hosts: all
|
- hosts: all
|
||||||
roles:
|
roles:
|
||||||
- role: bindep
|
- bindep
|
||||||
bindep_profile: test
|
|
||||||
bindep_dir: "{{ zuul_work_dir|default(omit) }}"
|
|
||||||
- ensure-tox
|
- ensure-tox
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
|||||||
@@ -11,7 +11,5 @@
|
|||||||
gitreview.username: proposal-bot
|
gitreview.username: proposal-bot
|
||||||
- legacy-copy-project-config-scripts
|
- legacy-copy-project-config-scripts
|
||||||
- add-sshkey
|
- add-sshkey
|
||||||
- role: bindep
|
- bindep
|
||||||
bindep_profile: test
|
|
||||||
bindep_dir: "{{ zuul.project.src_dir }}"
|
|
||||||
- ensure-tox
|
- ensure-tox
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
- hosts: all
|
- hosts: all
|
||||||
roles:
|
roles:
|
||||||
- role: bindep
|
- bindep
|
||||||
bindep_profile: test
|
|
||||||
bindep_dir: "src/{{ zuul.project.canonical_name }}"
|
|
||||||
- ensure-tox
|
- ensure-tox
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
|||||||
@@ -16,9 +16,7 @@
|
|||||||
user.email: infra-root@openstack.org
|
user.email: infra-root@openstack.org
|
||||||
user.signingkey: infra-root@openstack.org
|
user.signingkey: infra-root@openstack.org
|
||||||
gitreview.username: release
|
gitreview.username: release
|
||||||
- role: bindep
|
- bindep
|
||||||
bindep_profile: test
|
|
||||||
bindep_dir: "src/{{ zuul.project.canonical_name }}"
|
|
||||||
- legacy-copy-project-config-scripts
|
- legacy-copy-project-config-scripts
|
||||||
- add-sshkey
|
- add-sshkey
|
||||||
- add-launchpad-credentials
|
- add-launchpad-credentials
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
roles:
|
roles:
|
||||||
- role: bindep
|
- role: bindep
|
||||||
bindep_profile: doc
|
bindep_profile: doc
|
||||||
bindep_dir: "{{ zuul_work_dir }}"
|
|
||||||
- role: ensure-sphinx
|
- role: ensure-sphinx
|
||||||
doc_building_packages:
|
doc_building_packages:
|
||||||
- sphinx
|
- sphinx
|
||||||
|
|||||||
@@ -2,6 +2,5 @@
|
|||||||
roles:
|
roles:
|
||||||
- role: bindep
|
- role: bindep
|
||||||
bindep_profile: doc
|
bindep_profile: doc
|
||||||
bindep_dir: "{{ zuul_work_dir|default(omit) }}"
|
|
||||||
- ensure-sphinx
|
- ensure-sphinx
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
- hosts: all
|
- hosts: all
|
||||||
roles:
|
roles:
|
||||||
- role: bindep
|
- bindep
|
||||||
bindep_profile: test
|
|
||||||
bindep_dir: "src/{{ zuul.project.canonical_name }}"
|
|
||||||
- legacy-install-afs-with-puppet
|
- legacy-install-afs-with-puppet
|
||||||
- legacy-copy-project-config-scripts
|
- legacy-copy-project-config-scripts
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
- hosts: all
|
- hosts: all
|
||||||
roles:
|
roles:
|
||||||
- role: bindep
|
- bindep
|
||||||
bindep_profile: test
|
|
||||||
bindep_dir: "src/{{ zuul.project.canonical_name }}"
|
|
||||||
- ensure-tox
|
- ensure-tox
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
|||||||
Reference in New Issue
Block a user