From c1eb0a232c901fcc1b96e71ca046bb7ca41bee71 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 22 Jan 2021 15:52:40 +0100
Subject: [PATCH] Bump CI to FreeBSD 11.4, 12.2. (#1657)

* Bump CI to FreeBSD 11.4, 12.2.

* Make FreeBSD Python package selection more future-proof.
---
 .azure-pipelines/azure-pipelines.yml                      | 8 ++++----
 tests/integration/targets/setup_openssl/vars/FreeBSD.yml  | 2 +-
 .../targets/setup_postgresql_db/vars/FreeBSD-11-py3.yml   | 2 +-
 .../targets/setup_postgresql_db/vars/FreeBSD-12.0-py3.yml | 2 +-
 .../targets/setup_postgresql_db/vars/FreeBSD-12.1-py3.yml | 2 +-
 tests/integration/targets/xml/tasks/main.yml              | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index a38b880493..139c7a8df2 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -150,10 +150,10 @@ stages:
               test: rhel/7.8
             - name: RHEL 8.2
               test: rhel/8.2
-            - name: FreeBSD 11.1
-              test: freebsd/11.1
-            - name: FreeBSD 12.1
-              test: freebsd/12.1
+            - name: FreeBSD 11.4
+              test: freebsd/11.4
+            - name: FreeBSD 12.2
+              test: freebsd/12.2
           groups:
             - 1
             - 2
diff --git a/tests/integration/targets/setup_openssl/vars/FreeBSD.yml b/tests/integration/targets/setup_openssl/vars/FreeBSD.yml
index 608689158a..4fef270602 100644
--- a/tests/integration/targets/setup_openssl/vars/FreeBSD.yml
+++ b/tests/integration/targets/setup_openssl/vars/FreeBSD.yml
@@ -1,3 +1,3 @@
 pyopenssl_package_name: py27-openssl
-pyopenssl_package_name_python3: py36-openssl
+pyopenssl_package_name_python3: "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-openssl"
 openssl_package_name: openssl
diff --git a/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-11-py3.yml b/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-11-py3.yml
index 2f6b0d9846..e24226b4bc 100644
--- a/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-11-py3.yml
+++ b/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-11-py3.yml
@@ -1,6 +1,6 @@
 postgresql_packages:
   - postgresql95-server
-  - py36-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"
diff --git a/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.0-py3.yml b/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.0-py3.yml
index 2f6b0d9846..e24226b4bc 100644
--- a/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.0-py3.yml
+++ b/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.0-py3.yml
@@ -1,6 +1,6 @@
 postgresql_packages:
   - postgresql95-server
-  - py36-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"
diff --git a/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.1-py3.yml b/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.1-py3.yml
index cd7c83a4c1..d116e42589 100644
--- a/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.1-py3.yml
+++ b/tests/integration/targets/setup_postgresql_db/vars/FreeBSD-12.1-py3.yml
@@ -1,6 +1,6 @@
 postgresql_packages:
   - postgresql11-server
-  - py36-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"
diff --git a/tests/integration/targets/xml/tasks/main.yml b/tests/integration/targets/xml/tasks/main.yml
index a5c6e87ac2..928c46e0f3 100644
--- a/tests/integration/targets/xml/tasks/main.yml
+++ b/tests/integration/targets/xml/tasks/main.yml
@@ -6,7 +6,7 @@
 
 - name: Install lxml (FreeBSD)
   package:
-    name: '{{ "py27-lxml" if ansible_python.version.major == 2 else "py36-lxml" }}'
+    name: 'py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-lxml'
     state: present
   when: ansible_os_family == "FreeBSD"