mirror of https://github.com/ansible/ansible.git
Fix postgresql_lang integration test for CentOS 8 (#64872)
* Only search inside the role for files to include When a role is called as a dependency, both roles are searched. This can cause the incorrect file to be included if it is picked up from the parent role.pull/65007/head
parent
1df62f129a
commit
fcd29406a2
@ -1,7 +1,20 @@
|
||||
# Initial CI tests of postgresql_lang module
|
||||
- import_tasks: postgresql_lang_initial.yml
|
||||
when: ansible_distribution == 'CentOS'
|
||||
- name: Include distribution specific variables
|
||||
include_vars: "{{ lookup('first_found', params) }}"
|
||||
vars:
|
||||
params:
|
||||
files:
|
||||
- "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_major_version }}.yml"
|
||||
- default.yml
|
||||
paths:
|
||||
- vars
|
||||
|
||||
# CI tests of owner param
|
||||
- import_tasks: postgresql_lang_add_owner_param.yml
|
||||
when: ansible_distribution == 'CentOS'
|
||||
# Only run on CentOS 7 because there is a stack trace on CentOS 8 because the module
|
||||
# is looking for the incorrect version of plpython.
|
||||
# https://gist.github.com/samdoran/8fc1b4ae834d3e66d1895d087419b8d8
|
||||
- name: Initial CI tests of postgresql_lang module
|
||||
when:
|
||||
- ansible_facts.distribution == 'CentOS'
|
||||
- ansible_facts.distribution_major_version is version ('7', '==')
|
||||
block:
|
||||
- include_tasks: postgresql_lang_initial.yml
|
||||
- include_tasks: postgresql_lang_add_owner_param.yml
|
||||
|
@ -0,0 +1,3 @@
|
||||
postgresql_lang_packages:
|
||||
- postgresql-plperl
|
||||
- postgresql-plpython
|
@ -0,0 +1,3 @@
|
||||
postgresql_lang_packages:
|
||||
- postgresql-plperl
|
||||
- postgresql-plpython3
|
Loading…
Reference in New Issue