Remove Python 2 specific parts from integration tests (#10897)

* Remove Python 2 specific parts from integration tests.

* Remove more constraints.

tests/integration/targets/setup_postgresql_db/tasks/main.yml

@@ -20,25 +20,15 @@
 - meta: end_play
   when: ansible_facts.distribution == 'Fedora' and ansible_facts.distribution_major_version == '34'
 
-- name: python 2
-  set_fact:
-    python_suffix: ''
-  when: ansible_python_version is version('3', '<')
-
-- name: python 3
-  set_fact:
-    python_suffix: -py3
-  when: ansible_python_version is version('3', '>=')
-
 - name: Include distribution and Python version specific variables
   include_vars: '{{ lookup(''first_found'', params) }}'
   vars:
     params:
       files:
-        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}{{ python_suffix }}.yml'
-        - '{{ ansible_distribution }}-{{ ansible_distribution_version }}{{ python_suffix }}.yml'
-        - '{{ ansible_os_family }}{{ python_suffix }}.yml'
-        - default{{ python_suffix }}.yml
+        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
+        - '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
+        - '{{ ansible_os_family }}.yml'
+        - default.yml
       paths:
         - '{{ role_path }}/vars'
 

tests/integration/targets/setup_postgresql_db/vars/Debian-8.yml

@@ -1,13 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-postgresql_packages:
-  - "postgresql"
-  - "postgresql-common"
-  - "python-psycopg2"
-
-pg_hba_location: "/etc/postgresql/9.4/main/pg_hba.conf"
-pg_dir: "/var/lib/postgresql/9.4/main"
-pg_ver: 9.4

tests/integration/targets/setup_postgresql_db/vars/FreeBSD-11-py3.yml

@@ -1,17 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-postgresql_packages:
-  - postgresql95-server
-  - "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-psycopg2"
-
-pg_dir: /usr/local/pgsql/data
-pg_hba_location: "{{ pg_dir }}/pg_hba.conf"
-pg_ver: 9.5
-pg_user: pgsql
-pg_group: pgsql
-
-locale_latin_suffix: .ISO8859-1
-locale_utf8_suffix: .UTF-8

tests/integration/targets/setup_postgresql_db/vars/FreeBSD-11.yml

@@ -5,7 +5,7 @@
 
 postgresql_packages:
   - postgresql95-server
-  - py27-psycopg2
+  - "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-psycopg2"
 
 pg_dir: /usr/local/pgsql/data
 pg_hba_location: "{{ pg_dir }}/pg_hba.conf"

tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.0-py3.yml

@@ -1,17 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-postgresql_packages:
-  - postgresql95-server
-  - "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-psycopg2"
-
-pg_dir: /usr/local/pgsql/data
-pg_hba_location: "{{ pg_dir }}/pg_hba.conf"
-pg_ver: 9.5
-pg_user: pgsql
-pg_group: pgsql
-
-locale_latin_suffix: .ISO8859-1
-locale_utf8_suffix: .UTF-8

tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.0.yml

@@ -4,12 +4,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 postgresql_packages:
-  - postgresql96-server
-  - py27-psycopg2
+  - postgresql95-server
+  - "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-psycopg2"
 
 pg_dir: /usr/local/pgsql/data
 pg_hba_location: "{{ pg_dir }}/pg_hba.conf"
-pg_ver: 9.6
+pg_ver: 9.5
 pg_user: pgsql
 pg_group: pgsql
 

tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.1-py3.yml

@@ -1,17 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-postgresql_packages:
-  - postgresql11-server
-  - "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-psycopg2"
-
-pg_dir: /var/db/postgres/data11
-pg_hba_location: "{{ pg_dir }}/pg_hba.conf"
-pg_ver: 11
-pg_user: postgres
-pg_group: postgres
-
-locale_latin_suffix: .ISO8859-1
-locale_utf8_suffix: .UTF-8

tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.1.yml

@@ -5,7 +5,7 @@
 
 postgresql_packages:
   - postgresql11-server
-  - py27-psycopg2
+  - "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-psycopg2"
 
 pg_dir: /var/db/postgres/data11
 pg_hba_location: "{{ pg_dir }}/pg_hba.conf"

tests/integration/targets/setup_postgresql_db/vars/RedHat-py3.yml

@@ -1,13 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-postgresql_packages:
-  - "postgresql-server"
-  - "python3-psycopg2"
-  - "bzip2"
-  - "xz"
-
-pg_hba_location: "/var/lib/pgsql/data/pg_hba.conf"
-pg_dir: "/var/lib/pgsql/data"

tests/integration/targets/setup_postgresql_db/vars/RedHat.yml

@@ -5,8 +5,9 @@
 
 postgresql_packages:
   - "postgresql-server"
-  - "python-psycopg2"
+  - "python3-psycopg2"
   - "bzip2"
+  - "xz"
 
 pg_hba_location: "/var/lib/pgsql/data/pg_hba.conf"
 pg_dir: "/var/lib/pgsql/data"

tests/integration/targets/setup_postgresql_db/vars/Ubuntu-12.yml

@@ -1,13 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-postgresql_packages:
-  - "postgresql"
-  - "postgresql-common"
-  - "python-psycopg2"
-
-pg_hba_location: "/etc/postgresql/9.1/main/pg_hba.conf"
-pg_dir: "/var/lib/postgresql/9.1/main"
-pg_ver: 9.1

tests/integration/targets/setup_postgresql_db/vars/Ubuntu-14.yml

@@ -1,13 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-postgresql_packages:
-  - "postgresql"
-  - "postgresql-common"
-  - "python-psycopg2"
-
-pg_hba_location: "/etc/postgresql/9.3/main/pg_hba.conf"
-pg_dir: "/var/lib/postgresql/9.3/main"
-pg_ver: 9.3

tests/integration/targets/setup_postgresql_db/vars/Ubuntu-16-py3.yml

@@ -1,13 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-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

tests/integration/targets/setup_postgresql_db/vars/Ubuntu-16.yml

@@ -6,7 +6,7 @@
 postgresql_packages:
   - "postgresql"
   - "postgresql-common"
-  - "python-psycopg2"
+  - "python3-psycopg2"
 
 pg_hba_location: "/etc/postgresql/9.5/main/pg_hba.conf"
 pg_dir: "/var/lib/postgresql/9.5/main"

tests/integration/targets/setup_postgresql_db/vars/default-py3.yml

@@ -1,11 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-postgresql_packages:
-  - "postgresql-server"
-  - "python3-psycopg2"
-
-pg_hba_location: "/var/lib/pgsql/data/pg_hba.conf"
-pg_dir: "/var/lib/pgsql/data"

tests/integration/targets/setup_postgresql_db/vars/default.yml

@@ -5,7 +5,7 @@
 
 postgresql_packages:
   - "postgresql-server"
-  - "python-psycopg2"
+  - "python3-psycopg2"
 
 pg_hba_location: "/var/lib/pgsql/data/pg_hba.conf"
 pg_dir: "/var/lib/pgsql/data"