mirror of
https://github.com/zebrajr/ansible.git
synced 2026-01-15 12:15:19 +00:00
ansible-test - Replace FreeBSD 13.3 with 13.4 (#84236)
* ansible-test - Replace FreeBSD 13.3 with 13.4 * ansible-test - Fix typos in bootstrap.sh * Skip libfaketime on FreeBSD except FreeBSD 14
This commit is contained in:
@@ -90,8 +90,8 @@ stages:
|
||||
test: rhel/9.4@3.9
|
||||
- name: RHEL 9.4 py312
|
||||
test: rhel/9.4@3.12
|
||||
- name: FreeBSD 13.3
|
||||
test: freebsd/13.3
|
||||
- name: FreeBSD 13.4
|
||||
test: freebsd/13.4
|
||||
- name: FreeBSD 14.1
|
||||
test: freebsd/14.1
|
||||
groups:
|
||||
@@ -104,8 +104,8 @@ stages:
|
||||
test: macos/14.3
|
||||
- name: RHEL 9.4
|
||||
test: rhel/9.4
|
||||
- name: FreeBSD 13.3
|
||||
test: freebsd/13.3
|
||||
- name: FreeBSD 13.4
|
||||
test: freebsd/13.4
|
||||
- name: FreeBSD 14.1
|
||||
test: freebsd/14.1
|
||||
groups:
|
||||
|
||||
2
changelogs/fragments/ansible-test-remotes.yml
Normal file
2
changelogs/fragments/ansible-test-remotes.yml
Normal file
@@ -0,0 +1,2 @@
|
||||
minor_changes:
|
||||
- ansible-test - Replace remote FreeBSD 13.3 with 13.4.
|
||||
@@ -1 +0,0 @@
|
||||
faketime_pkg: libfaketime
|
||||
@@ -1 +1,2 @@
|
||||
remote_dir: "{{ remote_tmp_dir }}"
|
||||
faketime_pkg: libfaketime
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
vars:
|
||||
search:
|
||||
files:
|
||||
- '{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yml'
|
||||
- '{{ ansible_distribution | lower }}.yml'
|
||||
- '{{ ansible_os_family | lower }}.yml'
|
||||
- '{{ ansible_system | lower }}.yml'
|
||||
|
||||
4
test/integration/targets/setup_cron/vars/freebsd-14.yml
Normal file
4
test/integration/targets/setup_cron/vars/freebsd-14.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
cron_pkg:
|
||||
cron_service: cron
|
||||
list_pkg_files: pkg info --list-files
|
||||
faketime_pkg: libfaketime
|
||||
@@ -1,3 +1,4 @@
|
||||
cron_pkg:
|
||||
cron_service: cron
|
||||
list_pkg_files: pkg info --list-files
|
||||
faketime_pkg: ~
|
||||
|
||||
@@ -2,7 +2,7 @@ alpine/3.20 python=3.12 become=doas_sudo provider=aws arch=x86_64
|
||||
alpine become=doas_sudo provider=aws arch=x86_64
|
||||
fedora/40 python=3.12 become=sudo provider=aws arch=x86_64
|
||||
fedora become=sudo provider=aws arch=x86_64
|
||||
freebsd/13.3 python=3.9,3.11 python_dir=/usr/local/bin become=su_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 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
|
||||
|
||||
@@ -26,13 +26,13 @@ install_ssh_keys()
|
||||
echo "${ssh_private_key}" > "${ssh_private_key_path}"
|
||||
|
||||
# add public key to authorized_keys
|
||||
authoried_keys_path="${HOME}/.ssh/authorized_keys"
|
||||
authorized_keys_path="${HOME}/.ssh/authorized_keys"
|
||||
|
||||
# the existing file is overwritten to avoid conflicts (ex: RHEL on EC2 blocks root login)
|
||||
cat "${public_key_path}" > "${authoried_keys_path}"
|
||||
chmod 0600 "${authoried_keys_path}"
|
||||
cat "${public_key_path}" > "${authorized_keys_path}"
|
||||
chmod 0600 "${authorized_keys_path}"
|
||||
|
||||
# add localhost's server keys to known_hosts
|
||||
# add localhost server keys to known_hosts
|
||||
known_hosts_path="${HOME}/.ssh/known_hosts"
|
||||
|
||||
for key in /etc/ssh/ssh_host_*_key.pub; do
|
||||
@@ -168,16 +168,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
|
||||
13.3/3.9)
|
||||
# defaults above 'just work'TM
|
||||
;;
|
||||
13.3/3.11)
|
||||
jinja2_pkg="" # not available
|
||||
cryptography_pkg="" # not available
|
||||
pyyaml_pkg="" # not available
|
||||
;;
|
||||
14.1/3.9)
|
||||
# defaults above 'just work'TM
|
||||
13.4/3.11)
|
||||
# defaults available
|
||||
;;
|
||||
14.1/3.11)
|
||||
cryptography_pkg="" # not available
|
||||
|
||||
Reference in New Issue
Block a user