Browse Source

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
changes/30/531430/2
Monty Taylor 4 years ago
committed by Andreas Jaeger
parent
commit
09da196701
  1. 4
      playbooks/javascript/pre.yaml
  2. 4
      playbooks/project-config/pre-tox.yaml
  3. 4
      playbooks/proposal/pre.yaml
  4. 4
      playbooks/python-tarball/pre.yaml
  5. 4
      playbooks/release/pre.yaml
  6. 1
      playbooks/releasenotes/pre.yaml
  7. 1
      playbooks/sphinx/pre.yaml
  8. 4
      playbooks/wheel/pre.yaml
  9. 4
      playbooks/yaml2ical/pre.yaml

4
playbooks/javascript/pre.yaml

@ -1,8 +1,6 @@
- hosts: all
roles:
- role: bindep
bindep_profile: test
bindep_dir: "{{ zuul_work_dir }}"
- bindep
- test-setup
- install-nodejs
- revoke-sudo

4
playbooks/project-config/pre-tox.yaml

@ -1,7 +1,5 @@
- hosts: all
roles:
- role: bindep
bindep_profile: test
bindep_dir: "{{ zuul_work_dir|default(omit) }}"
- bindep
- ensure-tox
- revoke-sudo

4
playbooks/proposal/pre.yaml

@ -11,7 +11,5 @@
gitreview.username: proposal-bot
- legacy-copy-project-config-scripts
- add-sshkey
- role: bindep
bindep_profile: test
bindep_dir: "{{ zuul.project.src_dir }}"
- bindep
- ensure-tox

4
playbooks/python-tarball/pre.yaml

@ -1,7 +1,5 @@
- hosts: all
roles:
- role: bindep
bindep_profile: test
bindep_dir: "src/{{ zuul.project.canonical_name }}"
- bindep
- ensure-tox
- revoke-sudo

4
playbooks/release/pre.yaml

@ -16,9 +16,7 @@
user.email: infra-root@openstack.org
user.signingkey: infra-root@openstack.org
gitreview.username: release
- role: bindep
bindep_profile: test
bindep_dir: "src/{{ zuul.project.canonical_name }}"
- bindep
- legacy-copy-project-config-scripts
- add-sshkey
- add-launchpad-credentials

1
playbooks/releasenotes/pre.yaml

@ -2,7 +2,6 @@
roles:
- role: bindep
bindep_profile: doc
bindep_dir: "{{ zuul_work_dir }}"
- role: ensure-sphinx
doc_building_packages:
- sphinx

1
playbooks/sphinx/pre.yaml

@ -2,6 +2,5 @@
roles:
- role: bindep
bindep_profile: doc
bindep_dir: "{{ zuul_work_dir|default(omit) }}"
- ensure-sphinx
- revoke-sudo

4
playbooks/wheel/pre.yaml

@ -1,8 +1,6 @@
- hosts: all
roles:
- role: bindep
bindep_profile: test
bindep_dir: "src/{{ zuul.project.canonical_name }}"
- bindep
- legacy-install-afs-with-puppet
- legacy-copy-project-config-scripts

4
playbooks/yaml2ical/pre.yaml

@ -1,7 +1,5 @@
- hosts: all
roles:
- role: bindep
bindep_profile: test
bindep_dir: "src/{{ zuul.project.canonical_name }}"
- bindep
- ensure-tox
- revoke-sudo
Loading…
Cancel
Save