[stable-2.16] ansible-test - Replace FreeBSD 13.2 with 13.3 (#85030)

* ansible-test - Replace FreeBSD 13.2 with 13.3

* Fix psutil integration test

* Remove outdated constraint for paramiko setup

(cherry picked from commit 2b1a5dd7a0)

.azure-pipelines/azure-pipelines.yml

@@ -91,8 +91,8 @@ stages:
               test: rhel/9.2@3.9
             - name: RHEL 9.2 py311
               test: rhel/9.2@3.11
-            - name: FreeBSD 13.2
-              test: freebsd/13.2
+            - name: FreeBSD 13.3
+              test: freebsd/13.3
           groups:
             - 1
             - 2
@@ -105,8 +105,8 @@ stages:
               test: rhel/8.8
             - name: RHEL 9.2
               test: rhel/9.2
-            - name: FreeBSD 13.2
-              test: freebsd/13.2
+            - name: FreeBSD 13.3
+              test: freebsd/13.3
           groups:
             - 3
             - 4

changelogs/fragments/ansible_test_freebsd-13.3.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - ansible-test - Replace FreeBSD 13.2 remote with 13.3.

test/integration/targets/setup_paramiko/constraints.txt

@@ -1 +0,0 @@
-cryptography >= 2.5, < 3.4

test/integration/targets/wait_for/tasks/main.yml

@@ -167,9 +167,9 @@
       - waitfor is not changed
       - "waitfor.port == http_port"
 
-- name: install psutil using pip (non-Linux only)
+- name: install psutil using pip (non-Linux)
   pip:
-    name: psutil==5.8.0
+    name: psutil==5.9.8
   when: ansible_system != 'Linux'
 
 - name: Copy zombie.py

test/lib/ansible_test/_data/completion/remote.txt

@@ -2,7 +2,7 @@ alpine/3.18 python=3.11 become=doas_sudo provider=aws arch=x86_64
 alpine become=doas_sudo provider=aws arch=x86_64
 fedora/38 python=3.11 become=sudo provider=aws arch=x86_64
 fedora become=sudo provider=aws arch=x86_64
-freebsd/13.2 python=3.9,3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
+freebsd/13.3 python=3.9,3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
 freebsd python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
 macos/13.2 python=3.11 python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64
 macos python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64

test/lib/ansible_test/_util/target/setup/bootstrap.sh

@@ -168,19 +168,31 @@ bootstrap_remote_freebsd()
         jinja2_pkg="py${python_package_version}-jinja2"
         cryptography_pkg="py${python_package_version}-cryptography"
         pyyaml_pkg="py${python_package_version}-yaml"
+        packaging_pkg="py${python_package_version}-packaging"
 
         # Declare platform/python version combinations which do not have supporting OS packages available.
         # For these combinations ansible-test will use pip to install the requirements instead.
         case "${platform_version}/${python_version}" in
+            13.3/3.9)
+                # defaults above 'just work'TM
+                ;;
+            13.3/3.11)
+                jinja2_pkg=""  # not available
+                cryptography_pkg=""  # not available
+                pyyaml_pkg=""  # not available
+                ;;
             *)
+                # just assume nothing is available
                 jinja2_pkg=""  # not available
                 cryptography_pkg=""  # not available
                 pyyaml_pkg=""  # not available
+                packaging_pkg="" # not available
                 ;;
         esac
 
         packages="
             ${packages}
+            ${packaging_pkg}
             libyaml
             ${pyyaml_pkg}
             ${jinja2_pkg}