Skip to content

Commit 2112711

Browse files
committed
feat(platform): add support for Arch
* Semi-automated using myii/ssf-formula#40
1 parent 4e46ea0 commit 2112711

File tree

5 files changed

+35
-1
lines changed

5 files changed

+35
-1
lines changed

.cirrus.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,28 @@ docker_builder:
1111
# - INSTANCE: default-fedora-30-develop-py3
1212
# - INSTANCE: default-opensuse-leap-15-develop-py3
1313
# - INSTANCE: default-amazonlinux-2-develop-py2
14+
# - INSTANCE: default-arch-base-latest-develop-py2
1415
# - INSTANCE: default-debian-9-2019-2-py3
1516
- INSTANCE: default-ubuntu-1804-2019-2-py3
1617
# - INSTANCE: default-centos-7-2019-2-py3
1718
# - INSTANCE: default-fedora-30-2019-2-py3
1819
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
1920
- INSTANCE: default-amazonlinux-2-2019-2-py2
21+
- INSTANCE: default-arch-base-latest-2019-2-py2
2022
# - INSTANCE: default-debian-9-2018-3-py2
2123
# - INSTANCE: default-ubuntu-1604-2018-3-py2
2224
# - INSTANCE: default-centos-7-2018-3-py2
2325
- INSTANCE: default-fedora-29-2018-3-py2
2426
- INSTANCE: default-opensuse-leap-15-2018-3-py2
2527
# - INSTANCE: default-amazonlinux-2-2018-3-py2
28+
# - INSTANCE: default-arch-base-latest-2018-3-py2
2629
# - INSTANCE: default-debian-8-2017-7-py2
2730
# - INSTANCE: default-ubuntu-1604-2017-7-py2
2831
- INSTANCE: default-centos-6-2017-7-py2
2932
# - INSTANCE: default-fedora-29-2017-7-py2
3033
# - INSTANCE: default-opensuse-leap-15-2017-7-py2
3134
# - INSTANCE: default-amazonlinux-2-2017-7-py2
35+
# - INSTANCE: default-arch-base-latest-2017-7-py2
3236
bundle_install_script: bundle install
3337
verify_script:
3438
- bin/kitchen verify ${INSTANCE}

kitchen.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ platforms:
5353
provision_command:
5454
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
5555
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
56+
- name: arch-base-latest-develop-py2
57+
driver:
58+
image: netmanagers/salt-develop-py2:arch-base-latest
59+
provision_command:
60+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
61+
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
62+
run_command: /usr/lib/systemd/systemd
5663

5764
## SALT `2019.2`
5865
- name: debian-9-2019-2-py3
@@ -78,6 +85,10 @@ platforms:
7885
- name: amazonlinux-2-2019-2-py2
7986
driver:
8087
image: netmanagers/salt-2019.2-py2:amazonlinux-2
88+
- name: arch-base-latest-2019-2-py2
89+
driver:
90+
image: netmanagers/salt-2019.2-py2:arch-base-latest
91+
run_command: /usr/lib/systemd/systemd
8192

8293
## SALT `2018.3`
8394
- name: debian-9-2018-3-py2
@@ -103,6 +114,10 @@ platforms:
103114
- name: amazonlinux-2-2018-3-py2
104115
driver:
105116
image: netmanagers/salt-2018.3-py2:amazonlinux-2
117+
- name: arch-base-latest-2018-3-py2
118+
driver:
119+
image: netmanagers/salt-2018.3-py2:arch-base-latest
120+
run_command: /usr/lib/systemd/systemd
106121

107122
## SALT `2017.7`
108123
- name: debian-8-2017-7-py2
@@ -129,6 +144,10 @@ platforms:
129144
- name: amazonlinux-2-2017-7-py2
130145
driver:
131146
image: netmanagers/salt-2017.7-py2:amazonlinux-2
147+
- name: arch-base-latest-2017-7-py2
148+
driver:
149+
image: netmanagers/salt-2017.7-py2:arch-base-latest
150+
run_command: /usr/lib/systemd/systemd
132151

133152
provisioner:
134153
name: salt_solo

syslog_ng/osfamilymap.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
---
44
Gentoo:
55
package: app-admin/syslog-ng
6+
7+
Arch:
8+
service: syslog-ng@default.service

test/integration/default/controls/service_spec.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1+
syslogng_service =
2+
case platform[:name]
3+
when 'arch'
4+
'syslog-ng@default.service'
5+
else
6+
'syslog-ng'
7+
end
18
control 'SyslogNG service' do
29
title 'should be running and enabled'
310

4-
describe service('syslog-ng') do
11+
describe service(syslogng_service) do
512
it { should be_enabled }
613
it { should be_running }
714
end

test/integration/default/inspec.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ supports:
1515
- platform-name: suse
1616
- platform-name: freebsd
1717
- platform-name: amazon
18+
- platform-name: arch

0 commit comments

Comments
 (0)