Fix bindep path
Project config's site variables is already overriding the bindep_command variable [1], which is used in the bindep role. It's therefore impossible to override it with the path given in the playbook. This patch doesn't fully need the bindep role, as the whole purpose of this repo is to test bindep's behavior. Therefore this changes the play to use the checked-in bindep to install the appropriate packages, instead of /usr/bindep-env/bin/bindep. [1]: http://git.openstack.org/cgit/openstack-infra/project-config/tree/zuul/site-variables.yaml#n9 Change-Id: Iff71edaf20ef81c16eebfd3fe57c4e809d007e89
This commit is contained in:
parent
cec3a7576b
commit
ccbde48914
@ -1,5 +1,9 @@
|
||||
- hosts: all
|
||||
pre_tasks:
|
||||
vars:
|
||||
bindep_profile: test
|
||||
# Define the global file so that no local file gets used.
|
||||
bindep_file: /usr/local/bindep-fallback/bindep-fallback.txt
|
||||
tasks:
|
||||
- name: Install requirements
|
||||
pip:
|
||||
chdir: "{{ zuul_work_dir }}"
|
||||
@ -12,9 +16,15 @@
|
||||
virtualenv: "{{ zuul_work_virtualenv }}"
|
||||
name: .
|
||||
|
||||
roles:
|
||||
- role: bindep
|
||||
bindep_profile: test
|
||||
bindep_command: "{{ zuul_work_virtualenv }}/bin/bindep"
|
||||
# Define the global file so that no local file gets used.
|
||||
bindep_file: /usr/local/bindep-fallback/bindep-fallback.txt
|
||||
- name: Run bindep with the file
|
||||
command: "{{ zuul_work_virtualenv }}/bin/bindep -b -f {{ bindep_file }} {{ bindep_profile }}"
|
||||
register: _bindep_output
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
|
||||
- name: Install distro packages from bindep
|
||||
package:
|
||||
name: "{{ _bindep_output.stdout_lines }}"
|
||||
state: present
|
||||
become: yes
|
||||
when: _bindep_output.stdout_lines
|
||||
|
Loading…
x
Reference in New Issue
Block a user