Remove needs/privileged
from postgresql test. (#19907)
* Remove `needs/privileged` from postgresql test. * Add python 3 support to postgresql tests.
This commit is contained in:
parent
709a3aa42b
commit
95b59cd76c
3 changed files with 24 additions and 5 deletions
|
@ -1,5 +1,4 @@
|
||||||
destructive
|
destructive
|
||||||
needs/privileged
|
|
||||||
posix/ci/group1
|
posix/ci/group1
|
||||||
postgresql_db
|
postgresql_db
|
||||||
postgresql_privs
|
postgresql_privs
|
||||||
|
|
|
@ -1,10 +1,20 @@
|
||||||
|
- name: python 2
|
||||||
|
set_fact:
|
||||||
|
python_suffix: ""
|
||||||
|
when: ansible_python_version | version_compare('3', '<')
|
||||||
|
|
||||||
|
- name: python 3
|
||||||
|
set_fact:
|
||||||
|
python_suffix: "-py3"
|
||||||
|
when: ansible_python_version | version_compare('3', '>=')
|
||||||
|
|
||||||
- include_vars: '{{ item }}'
|
- include_vars: '{{ item }}'
|
||||||
with_first_found:
|
with_first_found:
|
||||||
- files:
|
- files:
|
||||||
- '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
|
- '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}{{ python_suffix }}.yml'
|
||||||
- '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
|
- '{{ ansible_distribution }}-{{ ansible_distribution_version }}{{ python_suffix }}.yml'
|
||||||
- '{{ ansible_os_family }}.yml'
|
- '{{ ansible_os_family }}{{ python_suffix }}.yml'
|
||||||
- 'default.yml'
|
- 'default{{ python_suffix }}.yml'
|
||||||
paths: '../vars'
|
paths: '../vars'
|
||||||
|
|
||||||
# Make sure we start fresh
|
# Make sure we start fresh
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
postgresql_service: "postgresql"
|
||||||
|
|
||||||
|
postgresql_packages:
|
||||||
|
- "postgresql"
|
||||||
|
- "postgresql-common"
|
||||||
|
- "python3-psycopg2"
|
||||||
|
|
||||||
|
pg_hba_location: "/etc/postgresql/9.5/main/pg_hba.conf"
|
||||||
|
pg_dir: "/var/lib/postgresql/9.5/main"
|
||||||
|
pg_ver: 9.5
|
Loading…
Reference in a new issue