瀏覽代碼

feat(platform): add support for `Arch`

* Semi-automated using https://github.com/myii/ssf-formula/pull/40
tags/v0.4.0
Imran Iqbal 5 年之前
父節點
當前提交
2112711492
沒有連結到貢獻者的電子郵件帳戶。
共有 5 個檔案被更改,包括 35 行新增1 行删除
  1. +4
    -0
      .cirrus.yml
  2. +19
    -0
      kitchen.yml
  3. +3
    -0
      syslog_ng/osfamilymap.yaml
  4. +8
    -1
      test/integration/default/controls/service_spec.rb
  5. +1
    -0
      test/integration/default/inspec.yml

+ 4
- 0
.cirrus.yml 查看文件

@@ -11,24 +11,28 @@ docker_builder:
# - INSTANCE: default-fedora-30-develop-py3
# - INSTANCE: default-opensuse-leap-15-develop-py3
# - INSTANCE: default-amazonlinux-2-develop-py2
# - INSTANCE: default-arch-base-latest-develop-py2
# - INSTANCE: default-debian-9-2019-2-py3
- INSTANCE: default-ubuntu-1804-2019-2-py3
# - INSTANCE: default-centos-7-2019-2-py3
# - INSTANCE: default-fedora-30-2019-2-py3
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
- INSTANCE: default-amazonlinux-2-2019-2-py2
- INSTANCE: default-arch-base-latest-2019-2-py2
# - INSTANCE: default-debian-9-2018-3-py2
# - INSTANCE: default-ubuntu-1604-2018-3-py2
# - INSTANCE: default-centos-7-2018-3-py2
- INSTANCE: default-fedora-29-2018-3-py2
- INSTANCE: default-opensuse-leap-15-2018-3-py2
# - INSTANCE: default-amazonlinux-2-2018-3-py2
# - INSTANCE: default-arch-base-latest-2018-3-py2
# - INSTANCE: default-debian-8-2017-7-py2
# - INSTANCE: default-ubuntu-1604-2017-7-py2
- INSTANCE: default-centos-6-2017-7-py2
# - INSTANCE: default-fedora-29-2017-7-py2
# - INSTANCE: default-opensuse-leap-15-2017-7-py2
# - INSTANCE: default-amazonlinux-2-2017-7-py2
# - INSTANCE: default-arch-base-latest-2017-7-py2
bundle_install_script: bundle install
verify_script:
- bin/kitchen verify ${INSTANCE}

+ 19
- 0
kitchen.yml 查看文件

@@ -53,6 +53,13 @@ platforms:
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
- name: arch-base-latest-develop-py2
driver:
image: netmanagers/salt-develop-py2:arch-base-latest
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
run_command: /usr/lib/systemd/systemd

## SALT `2019.2`
- name: debian-9-2019-2-py3
@@ -78,6 +85,10 @@ platforms:
- name: amazonlinux-2-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:amazonlinux-2
- name: arch-base-latest-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd

## SALT `2018.3`
- name: debian-9-2018-3-py2
@@ -103,6 +114,10 @@ platforms:
- name: amazonlinux-2-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:amazonlinux-2
- name: arch-base-latest-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd

## SALT `2017.7`
- name: debian-8-2017-7-py2
@@ -129,6 +144,10 @@ platforms:
- name: amazonlinux-2-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:amazonlinux-2
- name: arch-base-latest-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd

provisioner:
name: salt_solo

+ 3
- 0
syslog_ng/osfamilymap.yaml 查看文件

@@ -3,3 +3,6 @@
---
Gentoo:
package: app-admin/syslog-ng

Arch:
service: syslog-ng@default.service

+ 8
- 1
test/integration/default/controls/service_spec.rb 查看文件

@@ -1,7 +1,14 @@
syslogng_service =
case platform[:name]
when 'arch'
'syslog-ng@default.service'
else
'syslog-ng'
end
control 'SyslogNG service' do
title 'should be running and enabled'

describe service('syslog-ng') do
describe service(syslogng_service) do
it { should be_enabled }
it { should be_running }
end

+ 1
- 0
test/integration/default/inspec.yml 查看文件

@@ -15,3 +15,4 @@ supports:
- platform-name: suse
- platform-name: freebsd
- platform-name: amazon
- platform-name: arch

Loading…
取消
儲存