From 4cbdf02efe50d0cb44aa87e954a2471dbac13094 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 14 Aug 2023 22:34:26 +0200 Subject: [PATCH] Replace FreeBSD 12.3 w/ 12.4 in CI & ansible-test (#81497) FreeBSD 12.3 bootstrap packages stopped being available. --- .azure-pipelines/azure-pipelines.yml | 4 ++-- changelogs/fragments/freebsd-12.3-replacement.yml | 4 ++++ test/lib/ansible_test/_data/completion/remote.txt | 2 +- test/lib/ansible_test/_util/target/setup/bootstrap.sh | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/freebsd-12.3-replacement.yml diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 399da3180bb..ec9f58eacb8 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -91,8 +91,8 @@ stages: test: rhel/8.6@3.9 - name: RHEL 9.0 test: rhel/9.0 - - name: FreeBSD 12.3 - test: freebsd/12.3 + - name: FreeBSD 12.4 + test: freebsd/12.4 - name: FreeBSD 13.1 test: freebsd/13.1 groups: diff --git a/changelogs/fragments/freebsd-12.3-replacement.yml b/changelogs/fragments/freebsd-12.3-replacement.yml new file mode 100644 index 00000000000..d40182f1234 --- /dev/null +++ b/changelogs/fragments/freebsd-12.3-replacement.yml @@ -0,0 +1,4 @@ +minor_changes: + - >- + ansible-test — Replaced `freebsd/12.3` remote with `freebsd/12.4`. + The former is no longer functional. diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index 192298bf0f4..4e607b7a546 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.16 python=3.10 become=doas_sudo provider=aws arch=x86_64 alpine become=doas_sudo provider=aws arch=x86_64 fedora/36 python=3.10 become=sudo provider=aws arch=x86_64 fedora become=sudo provider=aws arch=x86_64 -freebsd/12.3 python=3.8 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64 +freebsd/12.4 python=3.9 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64 freebsd/13.1 python=3.8,3.7,3.9,3.10 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/12.0 python=3.10 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 f2e82fbc968..ea17dad3875 100644 --- a/test/lib/ansible_test/_util/target/setup/bootstrap.sh +++ b/test/lib/ansible_test/_util/target/setup/bootstrap.sh @@ -163,6 +163,8 @@ bootstrap_remote_freebsd() # 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 + "12.4/3.9") + ;; *) jinja2_pkg="" # not available cryptography_pkg="" # not available