From 01b7d928aac2a161e52ae269352afe12b12e7608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sviatoslav=20Sydorenko=20=28=D0=A1=D0=B2=D1=8F=D1=82=D0=BE?= =?UTF-8?q?=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A1=D0=B8=D0=B4=D0=BE=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=BE=29?= Date: Mon, 11 Dec 2023 19:45:13 +0100 Subject: [backport-2.14] Replace FreeBSD 13.1 with 13.2 in CI and ansible-test (#82398) * [backport-2.14] Add FreeBSD 13.2 to ansible-test (#80698) (cherry picked from commit d12aa7f69cefddf8b849a93186d4afd8e6615bc5) * [backport-2.14] remove Freebsd 13.1 from test matrix (#81058) * remove Freebsd 13.1 from test matrix fixes #80416 Co-authored-by: Matt Clay (cherry picked from commit 534f688a53f076691f93041726931e4b218e9769) * Revert to the original Python versions for the branch Co-authored-by: Matt Martz --------- Co-authored-by: Brian Coca Co-authored-by: Matt Martz --- .azure-pipelines/azure-pipelines.yml | 8 ++++---- changelogs/fragments/ci_freebsd_new.yml | 2 ++ changelogs/fragments/fbsd13_1_remove.yml | 2 ++ test/lib/ansible_test/_data/completion/remote.txt | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/ci_freebsd_new.yml create mode 100644 changelogs/fragments/fbsd13_1_remove.yml diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index ec9f58eacb..0d881c7470 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -93,8 +93,8 @@ stages: test: rhel/9.0 - name: FreeBSD 12.4 test: freebsd/12.4 - - name: FreeBSD 13.1 - test: freebsd/13.1 + - name: FreeBSD 13.2 + test: freebsd/13.2 groups: - 1 - 2 @@ -107,8 +107,8 @@ stages: test: rhel/8.6 - name: RHEL 9.0 test: rhel/9.0 - - name: FreeBSD 13.1 - test: freebsd/13.1 + - name: FreeBSD 13.2 + test: freebsd/13.2 groups: - 3 - 4 diff --git a/changelogs/fragments/ci_freebsd_new.yml b/changelogs/fragments/ci_freebsd_new.yml new file mode 100644 index 0000000000..fff1a24229 --- /dev/null +++ b/changelogs/fragments/ci_freebsd_new.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Add FreeBSD 13.2 remote. diff --git a/changelogs/fragments/fbsd13_1_remove.yml b/changelogs/fragments/fbsd13_1_remove.yml new file mode 100644 index 0000000000..a334c1f8f8 --- /dev/null +++ b/changelogs/fragments/fbsd13_1_remove.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Removed `freebsd/13.1` remote. diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index 4e607b7a54..9cb8dee8a5 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/36 python=3.10 become=sudo provider=aws arch=x86_64 fedora become=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/13.2 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 -- cgit v1.2.3