From 5c7d361b6ec01f3dc82f5dbb53fa95e1eb378ef4 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 14 Aug 2023 22:34:33 +0200 Subject: [PATCH] [stable-2.13] Replace FreeBSD 12.{3->4} & 13.{0->1} @ testing (#81498) * Replace FreeBSD 12.3 w/ 12.4 in CI & ansible-test FreeBSD 12.3 bootstrap packages stopped being available. * Replace FreeBSD 13.0 w/ 13.1 in CI & ansible-test --- .azure-pipelines/azure-pipelines.yml | 8 ++++---- changelogs/fragments/freebsd-12.3-replacement.yml | 4 ++++ changelogs/fragments/freebsd-13.0-replacement.yml | 4 ++++ test/lib/ansible_test/_data/completion/remote.txt | 4 ++-- test/lib/ansible_test/_util/target/setup/bootstrap.sh | 2 ++ 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 changelogs/fragments/freebsd-12.3-replacement.yml create mode 100644 changelogs/fragments/freebsd-13.0-replacement.yml diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index c0997914fcb..dd96cbfab8a 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -90,10 +90,10 @@ stages: test: rhel/8.5@3.8 - name: RHEL 9.0 test: rhel/9.0 - - name: FreeBSD 12.3 - test: freebsd/12.3 - - name: FreeBSD 13.0 - test: freebsd/13.0 + - name: FreeBSD 12.4 + test: freebsd/12.4 + - name: FreeBSD 13.1 + test: freebsd/13.1 groups: - 1 - 2 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/changelogs/fragments/freebsd-13.0-replacement.yml b/changelogs/fragments/freebsd-13.0-replacement.yml new file mode 100644 index 00000000000..cba3ad5abf3 --- /dev/null +++ b/changelogs/fragments/freebsd-13.0-replacement.yml @@ -0,0 +1,4 @@ +minor_changes: + - >- + ansible-test — Replaced `freebsd/13.0` remote with `freebsd/13.1`. + 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 bd0a319b70e..6810bd476a9 100644 --- a/test/lib/ansible_test/_data/completion/remote.txt +++ b/test/lib/ansible_test/_data/completion/remote.txt @@ -2,8 +2,8 @@ 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/13.0 python=3.7,2.7,3.8,3.9 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 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 605e857b4dc..2b4d8603712 100644 --- a/test/lib/ansible_test/_util/target/setup/bootstrap.sh +++ b/test/lib/ansible_test/_util/target/setup/bootstrap.sh @@ -171,6 +171,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") + ;; "13.0/3.8") jinja2_pkg="" # not available cryptography_pkg="" # not available