diff options
| author | Matt Clay <matt@mystile.com> | 2025-01-08 02:15:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-08 02:15:27 +0100 |
| commit | 1b3face0658aadc44be2059acace107598563b6f (patch) | |
| tree | 6046095e217db796d97f116419b4efecf338ed91 | |
| parent | ansible-test - Replace RHEL 9.4 with 9.5 (#84526) (diff) | |
| download | ansible-1b3face0658aadc44be2059acace107598563b6f.tar.xz ansible-1b3face0658aadc44be2059acace107598563b6f.zip | |
ansible-test - Replace FreeBSD 14.1 with 14.2 (#84527)
* ansible-test - Replace FreeBSD 14.1 with 14.2
* Remove cron faketime testing from FreeBSD
| -rw-r--r-- | .azure-pipelines/azure-pipelines.yml | 8 | ||||
| -rw-r--r-- | changelogs/fragments/ansible-test-remotes.yml | 1 | ||||
| -rw-r--r-- | test/integration/targets/setup_cron/vars/freebsd-14.yml | 4 | ||||
| -rw-r--r-- | test/lib/ansible_test/_data/completion/remote.txt | 2 | ||||
| -rw-r--r-- | test/lib/ansible_test/_util/target/setup/bootstrap.sh | 10 |
5 files changed, 10 insertions, 15 deletions
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 744a82c784..1f9a825449 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -96,8 +96,8 @@ stages: test: rhel/9.5@3.12 - name: FreeBSD 13.4 test: freebsd/13.4 - - name: FreeBSD 14.1 - test: freebsd/14.1 + - name: FreeBSD 14.2 + test: freebsd/14.2 groups: - 1 - 2 @@ -110,8 +110,8 @@ stages: test: rhel/9.5 - name: FreeBSD 13.4 test: freebsd/13.4 - - name: FreeBSD 14.1 - test: freebsd/14.1 + - name: FreeBSD 14.2 + test: freebsd/14.2 groups: - 3 - 4 diff --git a/changelogs/fragments/ansible-test-remotes.yml b/changelogs/fragments/ansible-test-remotes.yml index 40250e7ba3..47a1a455a8 100644 --- a/changelogs/fragments/ansible-test-remotes.yml +++ b/changelogs/fragments/ansible-test-remotes.yml @@ -1,5 +1,6 @@ minor_changes: - ansible-test - Replace remote FreeBSD 13.3 with 13.4. + - ansible-test - Replace remote FreeBSD 14.1 with 14.2. - ansible-test - Replace remote Fedora 40 with 41. - ansible-test - Replace remote Alpine 3.20 with 3.21. - ansible-test - Replace remote RHEL 9.4 with 9.5. diff --git a/test/integration/targets/setup_cron/vars/freebsd-14.yml b/test/integration/targets/setup_cron/vars/freebsd-14.yml deleted file mode 100644 index 21d84a3c81..0000000000 --- a/test/integration/targets/setup_cron/vars/freebsd-14.yml +++ /dev/null @@ -1,4 +0,0 @@ -cron_pkg: -cron_service: cron -list_pkg_files: pkg info --list-files -faketime_pkg: libfaketime diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index 8fc1fedc9a..0c019e52c0 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.4 python=3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64 -freebsd/14.1 python=3.9,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 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64 macos/14.3 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 22a9e5dcc0..fc2b970f0a 100644 --- a/test/lib/ansible_test/_util/target/setup/bootstrap.sh +++ b/test/lib/ansible_test/_util/target/setup/bootstrap.sh @@ -162,19 +162,17 @@ bootstrap_remote_freebsd() if [ "${controller}" ]; then jinja2_pkg="py${python_package_version}-jinja2" cryptography_pkg="py${python_package_version}-cryptography" - pyyaml_pkg="py${python_package_version}-yaml" + pyyaml_pkg="py${python_package_version}-pyyaml" 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.4/3.11) - # defaults available + pyyaml_pkg="py${python_package_version}-yaml" # older naming scheme ;; - 14.1/3.11) - cryptography_pkg="" # not available - jinja2_pkg="" # not available - pyyaml_pkg="" # not available + 14.2/3.11) + # defaults available ;; *) # just assume nothing is available |