diff options
Diffstat (limited to 'test')
7 files changed, 14 insertions, 16 deletions
diff --git a/test/integration/targets/cron/defaults/main.yml b/test/integration/targets/cron/defaults/main.yml deleted file mode 100644 index 37e6fc3714..0000000000 --- a/test/integration/targets/cron/defaults/main.yml +++ /dev/null @@ -1 +0,0 @@ -faketime_pkg: libfaketime diff --git a/test/integration/targets/setup_cron/defaults/main.yml b/test/integration/targets/setup_cron/defaults/main.yml index a6d1965fd2..1a13ad2676 100644 --- a/test/integration/targets/setup_cron/defaults/main.yml +++ b/test/integration/targets/setup_cron/defaults/main.yml @@ -1 +1,2 @@ remote_dir: "{{ remote_tmp_dir }}" +faketime_pkg: libfaketime diff --git a/test/integration/targets/setup_cron/tasks/main.yml b/test/integration/targets/setup_cron/tasks/main.yml index 73cce2a266..90f3085df1 100644 --- a/test/integration/targets/setup_cron/tasks/main.yml +++ b/test/integration/targets/setup_cron/tasks/main.yml @@ -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' diff --git a/test/integration/targets/setup_cron/vars/freebsd-14.yml b/test/integration/targets/setup_cron/vars/freebsd-14.yml new file mode 100644 index 0000000000..21d84a3c81 --- /dev/null +++ b/test/integration/targets/setup_cron/vars/freebsd-14.yml @@ -0,0 +1,4 @@ +cron_pkg: +cron_service: cron +list_pkg_files: pkg info --list-files +faketime_pkg: libfaketime diff --git a/test/integration/targets/setup_cron/vars/freebsd.yml b/test/integration/targets/setup_cron/vars/freebsd.yml index 41ed449395..80c1fd28e2 100644 --- a/test/integration/targets/setup_cron/vars/freebsd.yml +++ b/test/integration/targets/setup_cron/vars/freebsd.yml @@ -1,3 +1,4 @@ cron_pkg: cron_service: cron list_pkg_files: pkg info --list-files +faketime_pkg: ~ diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index dea1d33a6a..011ce13348 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.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 diff --git a/test/lib/ansible_test/_util/target/setup/bootstrap.sh b/test/lib/ansible_test/_util/target/setup/bootstrap.sh index b926a8e673..22a9e5dcc0 100644 --- a/test/lib/ansible_test/_util/target/setup/bootstrap.sh +++ b/test/lib/ansible_test/_util/target/setup/bootstrap.sh @@ -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 |