From 35809806d3ab5d66fbb9696dc6a0009383e50673 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Fri, 2 Oct 2020 16:56:31 -0500 Subject: [PATCH] Remove incidental_timezone (#72063) * Add explicit coverage for templated undefined with_items element * ci_complete ci_coverage * Remove incidental_timezone * ci_complete ci_coverage --- .../targets/incidental_timezone/aliases | 5 - .../incidental_timezone/tasks/main.yml | 57 -- .../incidental_timezone/tasks/test.yml | 607 ------------------ .../targets/lookup_items/tasks/main.yml | 6 + 4 files changed, 6 insertions(+), 669 deletions(-) delete mode 100644 test/integration/targets/incidental_timezone/aliases delete mode 100644 test/integration/targets/incidental_timezone/tasks/main.yml delete mode 100644 test/integration/targets/incidental_timezone/tasks/test.yml diff --git a/test/integration/targets/incidental_timezone/aliases b/test/integration/targets/incidental_timezone/aliases deleted file mode 100644 index 834cafc98e3..00000000000 --- a/test/integration/targets/incidental_timezone/aliases +++ /dev/null @@ -1,5 +0,0 @@ -destructive -shippable/posix/incidental -skip/aix -skip/osx -skip/macos diff --git a/test/integration/targets/incidental_timezone/tasks/main.yml b/test/integration/targets/incidental_timezone/tasks/main.yml deleted file mode 100644 index 247ad6cff88..00000000000 --- a/test/integration/targets/incidental_timezone/tasks/main.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Because hwclock usually isn't available inside Docker containers in Shippable -# these tasks will detect if hwclock works and only run hwclock tests if it is -# supported. That is why it is recommended to run these tests locally with -# `--docker-privileged` on centos6, centos7 and ubuntu1404 images. Example -# command to run on centos6: -# -# ansible-test integration --docker centos6 --docker-privileged -v timezone - -## -## set path to timezone config files -## - -- name: set config file path on Debian - set_fact: - timezone_config_file: '/etc/timezone' - when: ansible_os_family == 'Debian' - -- name: set config file path on RedHat - set_fact: - timezone_config_file: '/etc/sysconfig/clock' - when: ansible_os_family == 'RedHat' - -## -## set path to hwclock config files -## - -- name: set config file path on Debian - set_fact: - hwclock_config_file: '/etc/default/rcS' - when: ansible_os_family == 'Debian' - -- name: set config file path on RedHat - set_fact: - hwclock_config_file: '/etc/sysconfig/clock' - when: ansible_os_family == 'RedHat' - -- name: Run tests - # Skip tests on Fedora because dbus fails to start unless the container is run in priveleged mode. - # Even then, it starts unreliably. This may be due to the move to cgroup v2 in Fedora 31. - # https://www.redhat.com/sysadmin/fedora-31-control-group-v2 - # Just skip Fedora rather than version-limiting because F30 goes EOL within a month of this writing - # and that is the oldest version we currently test in CI. F31+ are affected by the issue - # and making the tests work on them is something to deal with in community.general, not here. - when: ansible_distribution != 'Fedora' - block: - - name: set timezone to Etc/UTC - timezone: - name: Etc/UTC - register: original_timezone - - - block: - - include_tasks: test.yml - always: - - name: Restore original system timezone - {{ original_timezone.diff.before.name }} - timezone: - name: "{{ original_timezone.diff.before.name }}" - when: original_timezone is changed diff --git a/test/integration/targets/incidental_timezone/tasks/test.yml b/test/integration/targets/incidental_timezone/tasks/test.yml deleted file mode 100644 index ec0d854df0c..00000000000 --- a/test/integration/targets/incidental_timezone/tasks/test.yml +++ /dev/null @@ -1,607 +0,0 @@ -## -## test setting timezone, idempotency and checkmode -## - -- name: set timezone to Australia/Brisbane (checkmode) - timezone: - name: Australia/Brisbane - check_mode: yes - register: timezone_set_checkmode - -- name: ensure timezone reported as changed in checkmode - assert: - that: - - timezone_set_checkmode.changed - - timezone_set_checkmode.diff.after.name == 'Australia/Brisbane' - - timezone_set_checkmode.diff.before.name == 'Etc/UTC' - -- name: ensure checkmode didn't change the timezone - command: cmp /etc/localtime /usr/share/zoneinfo/Australia/Brisbane - register: result - failed_when: result is not failed - changed_when: no - -- name: ensure that checkmode didn't update the timezone in the config file - command: egrep '^(TIME)?ZONE="Etc/UTC"' {{ timezone_config_file }} - when: - - ansible_service_mgr != 'systemd' - - ansible_os_family == 'RedHat' - -- name: ensure that checkmode didn't update the timezone in the config file - command: egrep '^Etc/UTC' {{ timezone_config_file }} - when: - - ansible_service_mgr != 'systemd' - - ansible_os_family == 'Debian' - -- name: set timezone to Australia/Brisbane - timezone: - name: Australia/Brisbane - register: timezone_set - -- name: ensure timezone changed - assert: - that: - - timezone_set.changed - - timezone_set.diff.after.name == 'Australia/Brisbane' - - timezone_set.diff.before.name == 'Etc/UTC' - -- name: ensure that the timezone is actually set - command: cmp /etc/localtime /usr/share/zoneinfo/Australia/Brisbane - changed_when: no - -- name: ensure that the timezone is updated in the config file - command: egrep '^(TIME)?ZONE="Australia/Brisbane"' {{ timezone_config_file }} - when: - - ansible_service_mgr != 'systemd' - - ansible_os_family == 'RedHat' - -- name: ensure that the timezone is updated in the config file - command: egrep '^Australia/Brisbane' {{ timezone_config_file }} - when: - - ansible_service_mgr != 'systemd' - - ansible_os_family == 'Debian' - -- name: set timezone to Australia/Brisbane again - timezone: - name: Australia/Brisbane - register: timezone_again - -- name: ensure timezone idempotency - assert: - that: - - not timezone_again.changed - -- name: set timezone to Australia/Brisbane again in checkmode - timezone: - name: Australia/Brisbane - register: timezone_again_checkmode - -- name: set timezone idempotency (checkmode) - assert: - that: - - not timezone_again_checkmode.changed - -## -## tests for same timezones with different names -## - -- name: check dpkg-reconfigure - shell: type dpkg-reconfigure - register: check_dpkg_reconfigure - ignore_errors: yes - changed_when: no - -- name: check timedatectl - shell: type timedatectl && timedatectl - register: check_timedatectl - ignore_errors: yes - changed_when: no - -- block: - - name: set timezone to Etc/UTC - timezone: - name: Etc/UTC - - - name: change timezone from Etc/UTC to UTC - timezone: - name: UTC - register: timezone_etcutc_to_utc - - - name: check timezone changed from Etc/UTC to UTC - assert: - that: - - timezone_etcutc_to_utc.changed - - timezone_etcutc_to_utc.diff.before.name == 'Etc/UTC' - - timezone_etcutc_to_utc.diff.after.name == 'UTC' - - - name: change timezone from UTC to Etc/UTC - timezone: - name: Etc/UTC - register: timezone_utc_to_etcutc - - - name: check timezone changed from UTC to Etc/UTC - assert: - that: - - timezone_utc_to_etcutc.changed - - timezone_utc_to_etcutc.diff.before.name == 'UTC' - - timezone_utc_to_etcutc.diff.after.name == 'Etc/UTC' - - when: - # FIXME: Due to the bug of the dpkg-reconfigure, those tests failed on non-systemd debian - - check_dpkg_reconfigure.rc != 0 or check_timedatectl.rc == 0 - -## -## no systemd tests for timezone -## - -- block: - ## - ## test with empty config file - ## - - - name: empty config file - command: cp /dev/null {{ timezone_config_file }} - - - name: set timezone to Europe/Belgrade (empty config file) - timezone: - name: Europe/Belgrade - register: timezone_empty_conf - - - name: check if timezone set (empty config file) - assert: - that: - - timezone_empty_conf.changed - - timezone_empty_conf.diff.after.name == 'Europe/Belgrade' - - timezone_empty_conf.diff.before.name == 'n/a' - - - name: check if the timezone is actually set (empty config file) - command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no - - - ## - ## test with deleted config file - ## - - - name: remove config file - file: - path: '{{ timezone_config_file }}' - state: absent - - - name: set timezone to Europe/Belgrade (no config file) - timezone: - name: Europe/Belgrade - register: timezone_missing_conf - - - name: check if timezone set (no config file) - assert: - that: - - timezone_missing_conf.changed - - timezone_missing_conf.diff.after.name == 'Europe/Belgrade' - - timezone_missing_conf.diff.before.name == 'n/a' - - - name: check if the timezone is actually set (no config file) - command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no - - - ## - ## test with /etc/localtime as symbolic link to a zoneinfo file - ## - - - name: create symlink /etc/locatime -> /usr/share/zoneinfo/Etc/UTC - file: - src: /usr/share/zoneinfo/Etc/UTC - dest: /etc/localtime - state: link - force: yes - - - name: set timezone to Europe/Belgrade (over symlink) - timezone: - name: Europe/Belgrade - register: timezone_symllink - - - name: check if timezone set (over symlink) - assert: - that: - - timezone_symllink.changed - - timezone_symllink.diff.after.name == 'Europe/Belgrade' - - timezone_symllink.diff.before.name == 'Etc/UTC' - - - name: check if the timezone is actually set (over symlink) - command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no - - - ## - ## test with /etc/localtime as broken symbolic link - ## - - - name: set timezone to a broken symlink - file: - src: /tmp/foo - dest: /etc/localtime - state: link - force: yes - - - name: set timezone to Europe/Belgrade (over broken symlink) - timezone: - name: Europe/Belgrade - register: timezone_symllink_broken - - - name: check if timezone set (over broken symlink) - assert: - that: - - timezone_symllink_broken.changed - - timezone_symllink_broken.diff.after.name == 'Europe/Belgrade' - - timezone_symllink_broken.diff.before.name == 'n/a' - - - name: check if the timezone is actually set (over broken symlink) - command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no - - - ## - ## test with /etc/localtime set manually using copy - ## - - - name: set timezone manually by coping zone info file to /etc/localtime - copy: - src: /usr/share/zoneinfo/Etc/UTC - dest: /etc/localtime - remote_src: yes - - - name: set timezone to Europe/Belgrade (over copied file) - timezone: - name: Europe/Belgrade - register: timezone_copied - - - name: check if timezone set (over copied file) - assert: - that: - - timezone_copied.changed - - timezone_copied.diff.after.name == 'Europe/Belgrade' - - timezone_copied.diff.before.name == 'n/a' - - - name: check if the timezone is actually set (over copied file) - command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no - when: - - ansible_service_mgr != 'systemd' - - timezone_config_file is defined - - -#### -#### hwclock tests -#### - -- name: check if hwclock is supported in the environment - command: hwclock --test - register: hwclock_test - ignore_errors: yes - -- name: check if timedatectl works in the environment - command: timedatectl - register: timedatectl_test - ignore_errors: yes - -- name: - set_fact: - hwclock_supported: '{{ hwclock_test is successful or timedatectl_test is successful }}' -## -## test set hwclock, idempotency and checkmode -## - -- block: - - name: set hwclock to local - timezone: - hwclock: local - - - name: set hwclock to UTC (checkmode) - timezone: - hwclock: UTC - check_mode: yes - register: hwclock_set_checkmode - - - name: ensure hwclock reported as changed (checkmode) - assert: - that: - - hwclock_set_checkmode.changed - - hwclock_set_checkmode.diff.after.hwclock == 'UTC' - - hwclock_set_checkmode.diff.before.hwclock == 'local' - - - block: - - name: ensure that checkmode didn't update hwclock in /etc/adjtime - command: grep ^UTC /etc/adjtime - register: result - failed_when: result is not failed - - - name: ensure that checkmode didn't update hwclock the config file - command: grep ^UTC=no {{ hwclock_config_file }} - when: ansible_service_mgr != 'systemd' - - - name: set hwclock to UTC - timezone: - hwclock: UTC - register: hwclock_set - - - name: ensure hwclock changed - assert: - that: - - hwclock_set.changed - - hwclock_set.diff.after.hwclock == 'UTC' - - hwclock_set.diff.before.hwclock == 'local' - - - block: - - name: ensure that hwclock is updated in /etc/adjtime - command: grep ^UTC /etc/adjtime - - - name: ensure that hwclock is updated in the config file - command: grep ^UTC=yes {{ hwclock_config_file }} - when: ansible_service_mgr != 'systemd' - - - name: set hwclock to RTC again - timezone: - hwclock: UTC - register: hwclock_again - - - name: set hwclock idempotency - assert: - that: - - not hwclock_again.changed - - - name: set hwclock to RTC again (checkmode) - timezone: - hwclock: UTC - check_mode: yes - register: hwclock_again_checkmode - - - name: set hwclock idempotency (checkmode) - assert: - that: - - not hwclock_again_checkmode.changed - - - ## - ## no systemd tests for hwclock - ## - - - block: - ## - ## test set hwclock with both /etc/adjtime and conf file deleted - ## - - - name: remove /etc/adjtime and conf file - file: - path: '{{ item }}' - state: absent - with_items: - - /etc/adjtime - - '{{ hwclock_config_file }}' - - - name: set hwclock to UTC with deleted /etc/adjtime and conf file - timezone: - hwclock: UTC - register: hwclock_set_utc_deleted_adjtime_and_conf - - - name: ensure hwclock changed with deleted /etc/adjtime and conf - assert: - that: - - hwclock_set_utc_deleted_adjtime_and_conf.changed - - hwclock_set_utc_deleted_adjtime_and_conf.diff.after.hwclock == 'UTC' - - hwclock_set_utc_deleted_adjtime_and_conf.diff.before.hwclock == 'n/a' - - - ## - ## test set hwclock with /etc/adjtime deleted - ## - - - name: remove /etc/adjtime - file: - path: '{{ item }}' - state: absent - with_items: - - /etc/adjtime - - - name: set hwclock to UTC with deleted /etc/adjtime - timezone: - hwclock: UTC - register: hwclock_set_utc_deleted_adjtime_utc - - - name: ensure hwclock changed with deleted /etc/adjtime - assert: - that: - - not hwclock_set_utc_deleted_adjtime_utc.changed - - hwclock_set_utc_deleted_adjtime_utc.diff.after.hwclock == 'UTC' - - hwclock_set_utc_deleted_adjtime_utc.diff.before.hwclock == 'UTC' - - - name: set hwclock to LOCAL with deleted /etc/adjtime - timezone: - hwclock: local - register: hwclock_set_local_deleted_adjtime_local - - - name: ensure hwclock changed to LOCAL with deleted /etc/adjtime - assert: - that: - - hwclock_set_local_deleted_adjtime_local.changed - - hwclock_set_local_deleted_adjtime_local.diff.after.hwclock == 'local' - - hwclock_set_local_deleted_adjtime_local.diff.before.hwclock == 'UTC' - - - ## - ## test set hwclock with conf file deleted - ## - - - name: remove conf file - file: - path: '{{ item }}' - state: absent - with_items: - - '{{ hwclock_config_file }}' - - - name: set hwclock to UTC with deleted conf - timezone: - hwclock: UTC - register: hwclock_set_utc_deleted_conf - - - name: ensure hwclock changed with deleted /etc/adjtime - assert: - that: - - hwclock_set_utc_deleted_conf.changed - - hwclock_set_utc_deleted_conf.diff.after.hwclock == 'UTC' - - hwclock_set_utc_deleted_conf.diff.before.hwclock == 'n/a' - - - ## - ## test set hwclock with /etc/adjtime missing UTC/LOCAL strings - ## - - - name: create /etc/adjtime without UTC/LOCAL - copy: - content: '0.0 0 0\n0' - dest: /etc/adjtime - - - name: set hwclock to UTC with broken /etc/adjtime - timezone: - hwclock: UTC - register: hwclock_set_utc_broken_adjtime - - - name: ensure hwclock doesn't report changed with broken /etc/adjtime - assert: - that: - - not hwclock_set_utc_broken_adjtime.changed - - hwclock_set_utc_broken_adjtime.diff.after.hwclock == 'UTC' - - hwclock_set_utc_broken_adjtime.diff.before.hwclock == 'UTC' - - - name: set hwclock to LOCAL with broken /etc/adjtime - timezone: - hwclock: local - register: hwclock_set_local_broken_adjtime - - - name: ensure hwclock changed to LOCAL with broken /etc/adjtime - assert: - that: - - hwclock_set_local_broken_adjtime.changed - - hwclock_set_local_broken_adjtime.diff.after.hwclock == 'local' - - hwclock_set_local_broken_adjtime.diff.before.hwclock == 'UTC' - when: - - ansible_service_mgr != 'systemd' - - hwclock_config_file is defined - - #### - #### timezone + hwclock tests - #### - - ## - ## test set timezone and hwclock, idempotency and checkmode - ## - - - name: set timezone to Etc/UTC and hwclock to local - timezone: - name: Etc/UTC - hwclock: local - - - name: set timezone to Europe/Belgrade and hwclock to UTC (checkmode) - timezone: - name: Europe/Belgrade - hwclock: UTC - check_mode: yes - register: tzclock_set_checkmode - - - name: ensure timezone and hwclock reported as changed in checkmode - assert: - that: - - tzclock_set_checkmode.changed - - tzclock_set_checkmode.diff.after.name == 'Europe/Belgrade' - - tzclock_set_checkmode.diff.before.name == 'Etc/UTC' - - tzclock_set_checkmode.diff.after.hwclock == 'UTC' - - tzclock_set_checkmode.diff.before.hwclock == 'local' - - - name: ensure checkmode didn't change the timezone - command: cmp /etc/localtime /usr/share/zoneinfo/Australia/Brisbane - register: result - failed_when: result is not failed - changed_when: no - - - block: - - name: ensure that checkmode didn't update the timezone in the config file - command: egrep '^(TIME)?ZONE="Etc/UTC"' {{ timezone_config_file }} - when: - - ansible_os_family == 'RedHat' - - - name: ensure that checkmode didn't update the timezone in the config file - command: egrep '^Etc/UTC' {{ timezone_config_file }} - when: - - ansible_os_family == 'Debian' - - - name: ensure that checkmode didn't update hwclock in /etc/adjtime - command: grep ^UTC /etc/adjtime - register: result - failed_when: result is not failed - - - name: ensure that checkmode didn't update hwclock the config file - command: grep ^UTC=no {{ hwclock_config_file }} - when: ansible_service_mgr != 'systemd' - - - name: set timezone to Europe/Belgrade and hwclock to UTC - timezone: - name: Europe/Belgrade - hwclock: UTC - register: tzclock_set - - - name: ensure timezone and hwclock changed - assert: - that: - - tzclock_set.changed - - tzclock_set.diff.after.name == 'Europe/Belgrade' - - tzclock_set.diff.before.name == 'Etc/UTC' - - tzclock_set.diff.after.hwclock == 'UTC' - - tzclock_set.diff.before.hwclock == 'local' - - - name: ensure that the timezone is actually set - command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no - - - block: - - name: ensure that the timezone is updated in the config file - command: egrep '^(TIME)?ZONE="Europe/Belgrade"' {{ timezone_config_file }} - when: - - ansible_os_family == 'RedHat' - - - name: ensure that the timezone is updated in the config file - command: egrep 'Europe/Belgrade' {{ timezone_config_file }} - when: - - ansible_os_family == 'Debian' - - - name: ensure that hwclock is updated in /etc/adjtime - command: grep ^UTC /etc/adjtime - - - name: ensure that hwclock is updated in the config file - command: grep ^UTC=yes {{ hwclock_config_file }} - when: ansible_service_mgr != 'systemd' - - - name: set timezone to Europe/Belgrade and hwclock to UTC again - timezone: - name: Europe/Belgrade - hwclock: UTC - register: tzclock_set_again - - - name: set timezone and hwclock idempotency - assert: - that: - - not tzclock_set_again.changed - - - name: set timezone to Europe/Belgrade and hwclock to UTC again (checkmode) - timezone: - name: Europe/Belgrade - hwclock: UTC - register: tzclock_set_again_checkmode - - - name: set timezone and hwclock idempotency in checkmode - assert: - that: - - not tzclock_set_again_checkmode.changed - - when: - - ansible_system == 'Linux' - - hwclock_supported diff --git a/test/integration/targets/lookup_items/tasks/main.yml b/test/integration/targets/lookup_items/tasks/main.yml index 12df8d0b202..15a2cf2196f 100644 --- a/test/integration/targets/lookup_items/tasks/main.yml +++ b/test/integration/targets/lookup_items/tasks/main.yml @@ -4,6 +4,12 @@ - 'foo' - 'bar' +- name: Undefined var, skipped + debug: + with_items: + - '{{ baz }}' + when: false + - debug: var=foo - debug: var=bar