Automated PR: Cookstyle Changes (#174)
* Cookstyle 7.26.1 Fixes Issues found and resolved with: test/integration/helpers/serverspec/spec_helper.rb - 9:21 convention: Style/FileRead - Use File.read. https://rubystyle.guidefile-read Signed-off-by: kitchen-porter <board@sous-chefs.org> * Update CHANGELOG.md * Use correct path for systemd on OpenSUSE Signed-off-by: Lance Albertson <lance@osuosl.org> Co-authored-by: Jason Field <Jason@avon-lea.co.uk> Co-authored-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
parent
c8bcdbb9db
commit
fedcb94f91
@ -4,6 +4,8 @@ This file is used to list changes made in each version of the postfix cookbook.
|
|||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
|
- resolved cookstyle error: test/integration/helpers/serverspec/spec_helper.rb:9:21 convention: `Style/FileRead`
|
||||||
|
|
||||||
## 6.0.4 - *2021-08-19*
|
## 6.0.4 - *2021-08-19*
|
||||||
|
|
||||||
## 6.0.3 - *2021-08-19*
|
## 6.0.3 - *2021-08-19*
|
||||||
|
@ -21,15 +21,11 @@ platforms:
|
|||||||
driver:
|
driver:
|
||||||
image: dokken/debian-9
|
image: dokken/debian-9
|
||||||
pid_one_command: /bin/systemd
|
pid_one_command: /bin/systemd
|
||||||
intermediate_instructions:
|
|
||||||
- RUN /usr/bin/apt-get update
|
|
||||||
|
|
||||||
- name: debian-10
|
- name: debian-10
|
||||||
driver:
|
driver:
|
||||||
image: dokken/debian-10
|
image: dokken/debian-10
|
||||||
pid_one_command: /bin/systemd
|
pid_one_command: /bin/systemd
|
||||||
intermediate_instructions:
|
|
||||||
- RUN /usr/bin/apt-get update
|
|
||||||
|
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
driver:
|
driver:
|
||||||
@ -50,24 +46,18 @@ platforms:
|
|||||||
driver:
|
driver:
|
||||||
image: dokken/ubuntu-16.04
|
image: dokken/ubuntu-16.04
|
||||||
pid_one_command: /bin/systemd
|
pid_one_command: /bin/systemd
|
||||||
intermediate_instructions:
|
|
||||||
- RUN /usr/bin/apt-get update
|
|
||||||
|
|
||||||
- name: ubuntu-18.04
|
- name: ubuntu-18.04
|
||||||
driver:
|
driver:
|
||||||
image: dokken/ubuntu-18.04
|
image: dokken/ubuntu-18.04
|
||||||
pid_one_command: /bin/systemd
|
pid_one_command: /bin/systemd
|
||||||
intermediate_instructions:
|
|
||||||
- RUN /usr/bin/apt-get update
|
|
||||||
|
|
||||||
- name: ubuntu-20.04
|
- name: ubuntu-20.04
|
||||||
driver:
|
driver:
|
||||||
image: dokken/ubuntu-20.04
|
image: dokken/ubuntu-20.04
|
||||||
pid_one_command: /bin/systemd
|
pid_one_command: /bin/systemd
|
||||||
intermediate_instructions:
|
|
||||||
- RUN /usr/bin/apt-get update
|
|
||||||
|
|
||||||
- name: opensuse-leap-15
|
- name: opensuse-leap-15
|
||||||
driver:
|
driver:
|
||||||
image: dokken/opensuse-leap-15
|
image: dokken/opensuse-leap-15
|
||||||
pid_one_command: /bin/systemd
|
pid_one_command: /usr/lib/systemd/systemd
|
||||||
|
@ -6,7 +6,7 @@ set :path, '/sbin:/usr/local/sbin:$PATH'
|
|||||||
def family
|
def family
|
||||||
fam = 'solaris2'
|
fam = 'solaris2'
|
||||||
return fam unless File.exist? '/etc/release'
|
return fam unless File.exist? '/etc/release'
|
||||||
fam = 'omnios' if File.open('/etc/release').read =~ /^\s*(OmniOS)/
|
fam = 'omnios' if File.read('/etc/release') =~ /^\s*(OmniOS)/
|
||||||
fam
|
fam
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user