Commit 24383d8d authored by Tim Smith's avatar Tim Smith
Browse files

Expand tests and fix Amazon tests


Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent b45d9ecd
......@@ -27,31 +27,33 @@ env:
- INSTANCE=default-fedora-latest CHEF_VERSION=13
- INSTANCE=default-ubuntu-1604 CHEF_VERSION=13
- INSTANCE=default-ubuntu-1804 CHEF_VERSION=13
- INSTANCE=default-opensuse-leap CHEF_VERSION=13
- INSTANCE=default-opensuse-leap-15 CHEF_VERSION=13
- INSTANCE=default-amazonlinux CHEF_VERSION=13
- INSTANCE=default-amazonlinux-2 CHEF_VERSION=13
- INSTANCE=manage-centos-7 CHEF_VERSION=13
- INSTANCE=default-centos-6 CHEF_VERSION=14
- INSTANCE=default-centos-7 CHEF_VERSION=14
- INSTANCE=default-centos-8 CHEF_VERSION=14
- INSTANCE=default-debian-8 CHEF_VERSION=14
- INSTANCE=default-debian-9 CHEF_VERSION=14
- INSTANCE=default-debian-10 CHEF_VERSION=14
- INSTANCE=default-fedora-latest CHEF_VERSION=14
- INSTANCE=default-ubuntu-1604 CHEF_VERSION=14
- INSTANCE=default-ubuntu-1804 CHEF_VERSION=14
- INSTANCE=default-opensuse-leap CHEF_VERSION=14
- INSTANCE=default-opensuse-leap-15 CHEF_VERSION=14
- INSTANCE=default-amazonlinux CHEF_VERSION=14
- INSTANCE=default-amazonlinux-2 CHEF_VERSION=14
- INSTANCE=manage-centos-7 CHEF_VERSION=14
- INSTANCE=default-centos-6
- INSTANCE=default-centos-7
- INSTANCE=default-centos-8
- INSTANCE=default-debian-8
- INSTANCE=default-debian-9
- INSTANCE=default-debian-10
- INSTANCE=default-fedora-latest
- INSTANCE=default-ubuntu-1604
- INSTANCE=default-ubuntu-1804
- INSTANCE=default-opensuse-leap
- INSTANCE=default-opensuse-leap-15
- INSTANCE=default-amazonlinux
- INSTANCE=default-amazonlinux-2
- INSTANCE=manage-centos-7
......
......@@ -56,6 +56,11 @@ platforms:
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd
- name: centos-8
driver:
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd
- name: fedora-latest
driver:
image: dokken/fedora-latest
......@@ -75,7 +80,7 @@ platforms:
intermediate_instructions:
- RUN /usr/bin/apt-get update
- name: opensuse-leap
- name: opensuse-leap-15
driver:
image: dokken/opensuse-leap-42
image: dokken/opensuse-leap-15
pid_one_command: /bin/systemd
......@@ -20,11 +20,8 @@ platforms:
- name: centos-7
- name: debian-9
- name: debian-10
- name: fedora-29
- name: opensuse-leap-42
- name: sles-11-sp2
driver:
box: chef/sles-11-sp2-x86_64 # private box
- name: fedora-latest
- name: opensuse-leap-15
- name: sles-12-sp1
driver:
box: chef/sles-12-sp1-x86_64 # private box
......
......@@ -2,7 +2,12 @@
if %w(debian ubuntu fedora redhat).include?(os[:family])
if %w(redhat fedora).include?(os[:family])
service_name = 'crond'
package_name = os[:release].to_i >= 6 ? 'cronie' : 'vixie-cron'
package_name = 'cronie'
# RHEL 7+ check
unless os[:name] == 'amazon' && os[:release].to_i >= 6
package_name = 'vixie-cron'
end
elsif %w(debian ubuntu).include?(os[:family])
service_name = 'cron'
package_name = 'cron'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment