Fix git test on FreeBSD with Python 3.x. (#54560)
This commit is contained in:
parent
6167ab125c
commit
2434abaaf7
2 changed files with 23 additions and 8 deletions
|
@ -10,7 +10,28 @@
|
|||
set_fact:
|
||||
virtualenv: "{{ command.stdout_lines[0] }}"
|
||||
|
||||
- include: 'pip.yml'
|
||||
- block:
|
||||
- name: install git, needed for repo installs
|
||||
package:
|
||||
name: git
|
||||
state: present
|
||||
when: ansible_distribution != "MacOSX"
|
||||
register: git_install
|
||||
|
||||
- include_tasks: pip.yml
|
||||
always:
|
||||
- name: remove unwanted packages
|
||||
package:
|
||||
name: git
|
||||
state: absent
|
||||
when: git_install.changed
|
||||
|
||||
- name: remove auto-installed packages from FreeBSD
|
||||
pkgng:
|
||||
name: git
|
||||
state: absent
|
||||
autoremove: yes
|
||||
when: git_install.changed and ansible_distribution == "FreeBSD"
|
||||
when: ansible_fips|bool != True
|
||||
module_defaults:
|
||||
pip:
|
||||
|
|
|
@ -18,12 +18,6 @@
|
|||
|
||||
# FIXME: replace the python test package
|
||||
|
||||
- name: install git, needed for repo installs
|
||||
package:
|
||||
name: git
|
||||
state: present
|
||||
when: ansible_distribution != "MacOSX"
|
||||
|
||||
# first some tests installed system-wide
|
||||
# verify things were not installed to start with
|
||||
|
||||
|
@ -139,7 +133,7 @@
|
|||
- "not (req_installed is changed)"
|
||||
|
||||
- name: install the same module from url
|
||||
pip:
|
||||
pip:
|
||||
name: "git+https://github.com/dvarrazzo/pyiso8601#egg=pyiso8601"
|
||||
virtualenv: "{{ output_dir }}/pipenv"
|
||||
editable: True
|
||||
|
|
Loading…
Reference in a new issue