From 58c9f480291060a98a49c18e86b10b200b0a009b Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 25 Jul 2025 18:09:37 -0700 Subject: [PATCH] ansible-test - Replace FreeBSD 14.2 with 14.3 (#85561) * ansible-test - Replace FreeBSD 14.2 with 14.3 * Fix CA bundle search priority --- .azure-pipelines/azure-pipelines.yml | 8 ++++---- changelogs/fragments/ansible-test-freebsd-14.3.yml | 2 ++ test/integration/targets/uri/tasks/main.yml | 2 +- test/lib/ansible_test/_data/completion/remote.txt | 2 +- test/lib/ansible_test/_util/target/setup/bootstrap.sh | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 changelogs/fragments/ansible-test-freebsd-14.3.yml diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 2e814a157af..cba19751b1a 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -98,8 +98,8 @@ stages: test: rhel/10.0 - name: FreeBSD 13.5 test: freebsd/13.5 - - name: FreeBSD 14.2 - test: freebsd/14.2 + - name: FreeBSD 14.3 + test: freebsd/14.3 groups: - 1 - 2 @@ -114,8 +114,8 @@ stages: test: rhel/10.0 - name: FreeBSD 13.5 test: freebsd/13.5 - - name: FreeBSD 14.2 - test: freebsd/14.2 + - name: FreeBSD 14.3 + test: freebsd/14.3 groups: - 3 - 4 diff --git a/changelogs/fragments/ansible-test-freebsd-14.3.yml b/changelogs/fragments/ansible-test-freebsd-14.3.yml new file mode 100644 index 00000000000..26bed1f894a --- /dev/null +++ b/changelogs/fragments/ansible-test-freebsd-14.3.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Replace FreeBSD 14.2 with 14.3. diff --git a/test/integration/targets/uri/tasks/main.yml b/test/integration/targets/uri/tasks/main.yml index fdf14b80431..4ab625f9db9 100644 --- a/test/integration/targets/uri/tasks/main.yml +++ b/test/integration/targets/uri/tasks/main.yml @@ -202,11 +202,11 @@ stat: path: '{{ item }}' loop: + - '{{ cafile_path.stdout_lines|default(["/_i_dont_exist_ca.pem"])|first }}' - /etc/ssl/certs/ca-bundle.crt - /etc/ssl/certs/ca-certificates.crt - /var/lib/ca-certificates/ca-bundle.pem - /usr/local/share/certs/ca-root-nss.crt - - '{{ cafile_path.stdout_lines|default(["/_i_dont_exist_ca.pem"])|first }}' - /etc/ssl/cert.pem register: ca_bundle_candidates diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index 59e72bc823b..8281bfac5e7 100644 --- a/test/lib/ansible_test/_data/completion/remote.txt +++ b/test/lib/ansible_test/_data/completion/remote.txt @@ -3,7 +3,7 @@ alpine become=doas_sudo provider=aws arch=x86_64 fedora/41 python=3.13 become=sudo provider=aws arch=x86_64 fedora become=sudo provider=aws arch=x86_64 freebsd/13.5 python=3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64 -freebsd/14.2 python=3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64 +freebsd/14.3 python=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/15.3 python=3.13 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 b7c373380d4..6947c34f21a 100644 --- a/test/lib/ansible_test/_util/target/setup/bootstrap.sh +++ b/test/lib/ansible_test/_util/target/setup/bootstrap.sh @@ -190,7 +190,7 @@ bootstrap_remote_freebsd() 13.5/3.11) # defaults available ;; - 14.2/3.11) + 14.3/3.11) # defaults available ;; *)