From 09da19670150b75dbd49df6ad9292db4d12e6c57 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 5 Jan 2018 10:26:46 -0600
Subject: [PATCH] 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
---
 playbooks/javascript/pre.yaml         | 4 +---
 playbooks/project-config/pre-tox.yaml | 4 +---
 playbooks/proposal/pre.yaml           | 4 +---
 playbooks/python-tarball/pre.yaml     | 4 +---
 playbooks/release/pre.yaml            | 4 +---
 playbooks/releasenotes/pre.yaml       | 1 -
 playbooks/sphinx/pre.yaml             | 1 -
 playbooks/wheel/pre.yaml              | 4 +---
 playbooks/yaml2ical/pre.yaml          | 4 +---
 9 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/playbooks/javascript/pre.yaml b/playbooks/javascript/pre.yaml
index 747029e83f..82ab17df6a 100644
--- a/playbooks/javascript/pre.yaml
+++ b/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
diff --git a/playbooks/project-config/pre-tox.yaml b/playbooks/project-config/pre-tox.yaml
index b2b8b1106c..e233e74c33 100644
--- a/playbooks/project-config/pre-tox.yaml
+++ b/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
diff --git a/playbooks/proposal/pre.yaml b/playbooks/proposal/pre.yaml
index 66d87aac59..59cdb35048 100644
--- a/playbooks/proposal/pre.yaml
+++ b/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
diff --git a/playbooks/python-tarball/pre.yaml b/playbooks/python-tarball/pre.yaml
index ded21cd6f7..e233e74c33 100644
--- a/playbooks/python-tarball/pre.yaml
+++ b/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
diff --git a/playbooks/release/pre.yaml b/playbooks/release/pre.yaml
index db9b18fa6b..36d914d46b 100644
--- a/playbooks/release/pre.yaml
+++ b/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
diff --git a/playbooks/releasenotes/pre.yaml b/playbooks/releasenotes/pre.yaml
index 9cc344edab..be5b39edc1 100644
--- a/playbooks/releasenotes/pre.yaml
+++ b/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
diff --git a/playbooks/sphinx/pre.yaml b/playbooks/sphinx/pre.yaml
index 272527b239..d0c744f8d0 100644
--- a/playbooks/sphinx/pre.yaml
+++ b/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
diff --git a/playbooks/wheel/pre.yaml b/playbooks/wheel/pre.yaml
index ab477253a8..79af98181b 100644
--- a/playbooks/wheel/pre.yaml
+++ b/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
 
diff --git a/playbooks/yaml2ical/pre.yaml b/playbooks/yaml2ical/pre.yaml
index ded21cd6f7..e233e74c33 100644
--- a/playbooks/yaml2ical/pre.yaml
+++ b/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