Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 46 additions & 23 deletions .azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,18 @@ stages:
- name: Units
test: 'devel/units/1'

- stage: Ansible_2_19
displayName: Sanity & Units 2.19
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
targets:
- name: Sanity
test: '2.19/sanity/1'
- name: Units
test: '2.19/units/1'

- stage: Ansible_2_18
displayName: Sanity & Units 2.18
dependsOn: []
Expand All @@ -97,26 +109,29 @@ stages:
- name: Units
test: '2.17/units/1'

- stage: Ansible_2_16
displayName: Sanity & Units 2.16
## Docker
- stage: Docker_devel
displayName: Docker devel
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
testFormat: devel/linux/{0}/1
targets:
- name: Sanity
test: '2.16/sanity/1'
- name: Units
test: '2.16/units/1'
- name: Fedora 41
test: fedora41
- name: Ubuntu 24.04
test: ubuntu2404
- name: Ubuntu 22.04
test: ubuntu2204

## Docker
- stage: Docker_devel
displayName: Docker devel
- stage: Docker_2_19
displayName: Docker 2.19
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
testFormat: devel/linux/{0}/1
testFormat: 2.19/linux/{0}/1
targets:
- name: Fedora 41
test: fedora41
Expand Down Expand Up @@ -151,17 +166,6 @@ stages:
- name: Ubuntu 22.04
test: ubuntu2204

- stage: Docker_2_16
displayName: Docker 2.16
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
testFormat: 2.16/linux/{0}/1
targets:
- name: Ubuntu 22.04
test: ubuntu2204

# Newer ansible versions don't work on Fedora 37.
# Left it here to keep testing against PostgreSQL 14
# that is still not EOL at the time being.
Expand Down Expand Up @@ -190,6 +194,17 @@ stages:
- name: RHEL 9.5
test: rhel/9.5

- stage: Remote_2_19
displayName: Remote 2.19
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
testFormat: 2.19/{0}/1
targets:
- name: RHEL 9.5
test: rhel/9.5

- stage: Remote_2_18
displayName: Remote devel
dependsOn: []
Expand All @@ -212,6 +227,13 @@ stages:
- name: RHEL 9.3
test: rhel/9.3

# Keep this until the tests work.
# It allows us to test against PostgreSQL 10.
# PostgreSQL 13 is still supported, but the closest
# version we test against is 14.
# Keeping testing against 10 and 14 should cover 13.
# When these tests stop working and it's hard to fix
# or when PostgreSQL 13 gets EOL, remove this target.
- stage: Remote_2_16
displayName: Remote 2.16
dependsOn: []
Expand All @@ -229,15 +251,16 @@ stages:
condition: succeededOrFailed()
dependsOn:
- Ansible_devel
- Ansible_2_19
- Ansible_2_18
- Ansible_2_17
- Ansible_2_16
- Docker_devel
- Docker_2_19
- Docker_2_18
- Docker_2_17
- Docker_2_16
- Docker_2_15
- Remote_devel
- Remote_2_19
- Remote_2_18
- Remote_2_17
- Remote_2_16
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ Tested with the following `ansible-core` releases:
- 2.16
- 2.17
- 2.18
- 2.19
- current development version

Ansible-core versions before 2.12.0 are not supported.
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/postgresql_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ def get_repl_info(self):

repl_dict = {}
for i in res:
repl_dict[i["pid"]] = dict(
repl_dict[str(i["pid"])] = dict(
usename=i["rolname"],
app_name=i["application_name"] if i["application_name"] else '',
client_addr=i["client_addr"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@
#
# Test conn_limit, encoding, collate, ctype, template options
#

- set_fact:
locale_latin_suffix: "{{ (locale_latin_suffix is not none) | ternary(locale_latin_suffix, '') }}"

- name: Create a DB with conn_limit, encoding, collate, ctype and template options
become_user: "{{ pg_user }}"
become: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,21 +110,21 @@
- result.version != {}
- result.version.raw is search('PostgreSQL')
- result.in_recovery == false
- result.databases.{{ db_default }}.collate
- result.databases.{{ db_default }}.languages
- result.databases.{{ db_default }}.namespaces
- result.databases.{{ db_default }}.extensions
- result.databases.{{ test_db }}.subscriptions.{{ test_subscription }}
- result.databases.{{ test_db }}.subscriptions.{{ test_subscription2 }}

- result.databases.db1.namespaces.db1_schema1
- result.databases.db1.namespaces.db1_schema2
- result.databases.db2.namespaces.db2_schema1
- result.databases.db2.namespaces.db2_schema2

- result.settings
- result.tablespaces
- result.roles
- result.databases[db_default]['collate'] is defined
- result.databases[db_default]['languages'] is defined
- result.databases[db_default]['namespaces'] is defined
- result.databases[db_default]['extensions'] is defined
- result.databases[test_db]['subscriptions'][test_subscription] is defined
- result.databases[test_db]['subscriptions'][test_subscription2] is defined

- result.databases.db1.namespaces.db1_schema1 is defined
- result.databases.db1.namespaces.db1_schema2 is defined
- result.databases.db2.namespaces.db2_schema1 is defined
- result.databases.db2.namespaces.db2_schema2 is defined

- result.settings is defined
- result.tablespaces is defined
- result.roles is defined

- name: Set full server version as X.Y.Z
set_fact:
Expand Down Expand Up @@ -158,7 +158,7 @@
- assert:
that:
- result.version != {}
- result.roles
- result.roles is defined
- result.in_recovery == false
- result.databases == {}
- result.repl_slots == {}
Expand All @@ -176,7 +176,7 @@
- assert:
that:
- result.version != {}
- result.roles
- result.roles is defined
- result.databases == {}
- result.repl_slots == {}
- result.replications == {}
Expand All @@ -192,7 +192,7 @@

- assert:
that:
- result.version
- result.version is defined
- result.roles == {}

- name: postgresql_info - check excluding filter param passed by list
Expand All @@ -210,7 +210,7 @@
- result.version == {}
- result.in_recovery == None
- result.roles == {}
- result.databases
- result.databases is defined

- name: postgresql_info - test return publication info
<<: *task_parameters
Expand All @@ -226,15 +226,15 @@
that:
- result.version != {}
- result.in_recovery == false
- result.databases.{{ db_default }}.collate
- result.databases.{{ db_default }}.languages
- result.databases.{{ db_default }}.namespaces
- result.databases.{{ db_default }}.extensions
- result.databases.{{ test_db }}.publications.{{ test_pub }}.ownername == '{{ pg_user }}'
- result.databases.{{ test_db }}.publications.{{ test_pub2 }}.puballtables == true
- result.settings
- result.tablespaces
- result.roles
- result.databases[db_default]['collate'] is defined
- result.databases[db_default]['languages'] is defined
- result.databases[db_default]['namespaces'] is defined
- result.databases[db_default]['extensions'] is defined
- result.databases[test_db]['publications'][test_pub]['ownername'] == '{{ pg_user }}'
- result.databases[test_db]['publications'][test_pub2]['puballtables'] == true
- result.settings is defined
- result.tablespaces is defined
- result.roles is defined

- name: postgresql_info - test trust_input parameter
<<: *task_parameters
Expand Down