From cd23556e80b0435f4ef57bd9ab75d42f12501e8a Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 22 Apr 2025 23:56:08 -0700 Subject: [PATCH] [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 2b1a5dd7a0a8f71743e680d2b4fb3cc0b40daeae) --- .azure-pipelines/azure-pipelines.yml | 8 ++++---- changelogs/fragments/ansible_test_freebsd-13.3.yml | 2 ++ .../targets/setup_paramiko/constraints.txt | 1 - test/integration/targets/wait_for/tasks/main.yml | 4 ++-- test/lib/ansible_test/_data/completion/remote.txt | 2 +- .../lib/ansible_test/_util/target/setup/bootstrap.sh | 12 ++++++++++++ 6 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 changelogs/fragments/ansible_test_freebsd-13.3.yml diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 308033cf5f4..8ced3d74286 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.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 diff --git a/changelogs/fragments/ansible_test_freebsd-13.3.yml b/changelogs/fragments/ansible_test_freebsd-13.3.yml new file mode 100644 index 00000000000..c06b203aa28 --- /dev/null +++ b/changelogs/fragments/ansible_test_freebsd-13.3.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Replace FreeBSD 13.2 remote with 13.3. diff --git a/test/integration/targets/setup_paramiko/constraints.txt b/test/integration/targets/setup_paramiko/constraints.txt index c502ba0d9c3..e69de29bb2d 100644 --- a/test/integration/targets/setup_paramiko/constraints.txt +++ b/test/integration/targets/setup_paramiko/constraints.txt @@ -1 +0,0 @@ -cryptography >= 2.5, < 3.4 diff --git a/test/integration/targets/wait_for/tasks/main.yml b/test/integration/targets/wait_for/tasks/main.yml index 74b8e9aa347..85617f35261 100644 --- a/test/integration/targets/wait_for/tasks/main.yml +++ b/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 diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index 06d4b5ef365..a29d34487f3 100644 --- a/test/lib/ansible_test/_data/completion/remote.txt +++ b/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 diff --git a/test/lib/ansible_test/_util/target/setup/bootstrap.sh b/test/lib/ansible_test/_util/target/setup/bootstrap.sh index ef4fa915e96..8d0fa2d85cd 100644 --- a/test/lib/ansible_test/_util/target/setup/bootstrap.sh +++ b/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}