diff options
| author | Adam Miller <admiller@redhat.com> | 2018-12-05 17:07:18 -0600 |
|---|---|---|
| committer | ansibot <ansibot@users.noreply.github.com> | 2018-12-05 18:07:18 -0500 |
| commit | a5d98d69ffa6d622d40a40fa9ce882d30864470c (patch) | |
| tree | f1496a35cbe731bc7b080dc01961fa033113a0d5 | |
| parent | 6c61336a4b9f126dade987668c6968622c52d7cf (diff) | |
| download | ansible-a5d98d69ffa6d622d40a40fa9ce882d30864470c.tar.gz | |
enable service integration test target for rhel8 beta (#48939)
Signed-off-by: Adam Miller <admiller@redhat.com>
| -rw-r--r-- | test/integration/targets/service/aliases | 1 | ||||
| -rw-r--r-- | test/integration/targets/service/tasks/main.yml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/test/integration/targets/service/aliases b/test/integration/targets/service/aliases index 7953a219a8..83a79adac3 100644 --- a/test/integration/targets/service/aliases +++ b/test/integration/targets/service/aliases @@ -3,4 +3,3 @@ shippable/posix/group1 skip/freebsd skip/osx systemd -skip/rhel8.0 diff --git a/test/integration/targets/service/tasks/main.yml b/test/integration/targets/service/tasks/main.yml index a131bf9a97..26b4c85dca 100644 --- a/test/integration/targets/service/tasks/main.yml +++ b/test/integration/targets/service/tasks/main.yml @@ -21,7 +21,7 @@ - name: detect systemd init system set_fact: service_type: systemd - when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and ( ansible_distribution_version is version('7', '>=') and ansible_distribution_version is version('8', '<'))) or ansible_distribution == 'Fedora' or (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('15.04', '>=')) or (ansible_distribution == 'Debian' and ansible_distribution_version is version('8', '>=')) or ansible_os_family == 'Suse' + when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and ansible_distribution_major_version is version('7', '>=')) or ansible_distribution == 'Fedora' or (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('15.04', '>=')) or (ansible_distribution == 'Debian' and ansible_distribution_version is version('8', '>=')) or ansible_os_family == 'Suse' - name: detect upstart init system set_fact: service_type: upstart |