From d6dfd9f502cd86c520d6ee970381582141a8829c Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Sat, 17 Oct 2015 09:25:49 -0400 Subject: [PATCH 1/3] run correct init system tests --- test/integration/roles/test_service/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/roles/test_service/tasks/main.yml b/test/integration/roles/test_service/tasks/main.yml index 6f941eeb5c1..712bfc1b7c1 100644 --- a/test/integration/roles/test_service/tasks/main.yml +++ b/test/integration/roles/test_service/tasks/main.yml @@ -11,9 +11,9 @@ - "install_result.mode == '0755'" - include: 'sysv_setup.yml' - when: ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] + when: ansible_distribution in ['Fedora', 'RedHat', 'CentOS', 'ScientificLinux'] and (ansible_distribution_version|version_compare('6', '>=') and ansible_distribution_version|version_compare('7', '<')) - include: 'systemd_setup.yml' - when: ansible_distribution == 'Fedora' + when: ansible_distribution in ['Fedora', 'RedHat', 'CentOS', 'ScientificLinux'] and (ansible_distribution_version|version_compare('7', '>=') and ansible_distribution_version|version_compare('8', '<')) - include: 'upstart_setup.yml' when: ansible_distribution == 'Ubuntu' From f864fa8727527744ea39e9c9dbc09872d6e8ff94 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Mon, 19 Oct 2015 13:21:34 -0400 Subject: [PATCH 2/3] run systemd tests for fedora --- test/integration/roles/test_service/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/roles/test_service/tasks/main.yml b/test/integration/roles/test_service/tasks/main.yml index 712bfc1b7c1..f15eaadb8b6 100644 --- a/test/integration/roles/test_service/tasks/main.yml +++ b/test/integration/roles/test_service/tasks/main.yml @@ -11,9 +11,9 @@ - "install_result.mode == '0755'" - include: 'sysv_setup.yml' - when: ansible_distribution in ['Fedora', 'RedHat', 'CentOS', 'ScientificLinux'] and (ansible_distribution_version|version_compare('6', '>=') and ansible_distribution_version|version_compare('7', '<')) + when: ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and (ansible_distribution_version|version_compare('6', '>=') and ansible_distribution_version|version_compare('7', '<')) - include: 'systemd_setup.yml' - when: ansible_distribution in ['Fedora', 'RedHat', 'CentOS', 'ScientificLinux'] and (ansible_distribution_version|version_compare('7', '>=') and ansible_distribution_version|version_compare('8', '<')) + when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and (ansible_distribution_version|version_compare('7', '>=') and ansible_distribution_version|version_compare('8', '<'))) or ansible_distribution == 'Fedora' - include: 'upstart_setup.yml' when: ansible_distribution == 'Ubuntu' From 6c265cde492e506041eade122ccc6c7660fdbb88 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Wed, 21 Oct 2015 09:15:27 -0400 Subject: [PATCH 3/3] invoke systemd test for ubuntu >= 15.04 else invoke upstart test --- test/integration/roles/test_service/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/roles/test_service/tasks/main.yml b/test/integration/roles/test_service/tasks/main.yml index f15eaadb8b6..54443d8adfa 100644 --- a/test/integration/roles/test_service/tasks/main.yml +++ b/test/integration/roles/test_service/tasks/main.yml @@ -13,9 +13,9 @@ - include: 'sysv_setup.yml' when: ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and (ansible_distribution_version|version_compare('6', '>=') and ansible_distribution_version|version_compare('7', '<')) - include: 'systemd_setup.yml' - when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and (ansible_distribution_version|version_compare('7', '>=') and ansible_distribution_version|version_compare('8', '<'))) or ansible_distribution == 'Fedora' + when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and (ansible_distribution_version|version_compare('7', '>=') and ansible_distribution_version|version_compare('8', '<'))) or ansible_distribution == 'Fedora' or (ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('15.04', '>=')) - include: 'upstart_setup.yml' - when: ansible_distribution == 'Ubuntu' + when: ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('15.04', '<') - name: enable the ansible test service service: name=ansible_test enabled=yes