openstack
/
tripleo-ansible
Code Issues Proposed changes

Ensure pip is installed 

We need pip and virtualenv for molcule jobs. This was dropped recently
in the base image so we need to handle this ourselves.

Change-Id: Ie5ba86c4d8aa97959d7336886536dc1439ce54bd
This commit is contained in:
Alex Schultz 2020-06-17 12:31:41 -06:00
parent bdf648ff20
commit 19ef86c627
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_ansible/roles/test_deps/tasks/main.yml
View File

@ -54,11 +54,13 @@
dest: /etc/yum.repos.d/delorean.repo dest: /etc/yum.repos.d/delorean.repo
- name: Install tripleo-repos package - name: Install tripleo-repos package
become: true
package: package:
name: "python*tripleo-repos" name: "python*tripleo-repos"
state: present state: present
- name: Tripleo setup block - name: Tripleo setup block
become: true
when: when:
- (ansible_os_family | lower) == 'redhat' - (ansible_os_family | lower) == 'redhat'
- test_deps_setup_tripleo | bool - test_deps_setup_tripleo | bool

6
zuul.d/playbooks/pre.yml
View File

@ -18,10 +18,15 @@
path: "{{ ansible_user_dir }}/zuul-output/logs" path: "{{ ansible_user_dir }}/zuul-output/logs"
state: directory state: directory
- name: Ensure pip is available
include_role:
name: ensure-pip
- name: Setup bindep - name: Setup bindep
pip: pip:
name: "bindep" name: "bindep"
virtualenv: "{{ ansible_user_dir }}/test-python" virtualenv: "{{ ansible_user_dir }}/test-python"
virtualenv_command: "{{ ensure_pip_virtualenv_command }}"
virtualenv_site_packages: true virtualenv_site_packages: true
- name: Run bindep - name: Run bindep
@ -34,6 +39,7 @@
pip: pip:
requirements: "{{ tripleo_ansible_project_path }}/molecule-requirements.txt" requirements: "{{ tripleo_ansible_project_path }}/molecule-requirements.txt"
virtualenv: "{{ ansible_user_dir }}/test-python" virtualenv: "{{ ansible_user_dir }}/test-python"
virtualenv_command: "{{ ensure_pip_virtualenv_command }}"
virtualenv_site_packages: true virtualenv_site_packages: true
- name: Display test-python virtualenv package versions - name: Display test-python virtualenv package versions