saltstack-formulas/bind-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/bind-formula.git synced 2025-04-16 17:50:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #137 from myii/chore/standardise-structure

Browse source 
ci(kitchen+travis): replace EOL pre-salted images
This commit is contained in:
Imran Iqbal 2019-09-05 21:20:54 +01:00 • committed by GitHub
commit aaaa7904b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 45 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.travis.yml
View file

@ -19,26 +19,30 @@ services:
# the `platforms` defined in `kitchen.yml` # the `platforms` defined in `kitchen.yml`
env: env:
matrix: matrix:
- INSTANCE: default-debian-9-develop-py3 - INSTANCE: default-debian-10-develop-py3
# - INSTANCE: default-ubuntu-1804-develop-py3 # - INSTANCE: default-ubuntu-1804-develop-py3
# - INSTANCE: default-centos-7-develop-py3 # - INSTANCE: default-centos-7-develop-py3
# - INSTANCE: default-fedora-29-develop-py3 # - INSTANCE: default-fedora-30-develop-py3
# - INSTANCE: default-opensuse-leap-15-develop-py3 # - INSTANCE: default-opensuse-leap-15-develop-py3
# - INSTANCE: default-amazonlinux-2-develop-py2
# - INSTANCE: default-debian-9-2019-2-py3 # - INSTANCE: default-debian-9-2019-2-py3
- INSTANCE: default-ubuntu-1804-2019-2-py3 - INSTANCE: default-ubuntu-1804-2019-2-py3
- INSTANCE: default-centos-7-2019-2-py3 # - INSTANCE: default-centos-7-2019-2-py3
# - INSTANCE: default-fedora-29-2019-2-py3 # - INSTANCE: default-fedora-30-2019-2-py3
# - INSTANCE: default-opensuse-leap-15-2019-2-py3 # - INSTANCE: default-opensuse-leap-15-2019-2-py3
- INSTANCE: default-amazonlinux-2-2019-2-py2
# - INSTANCE: default-debian-9-2018-3-py2 # - INSTANCE: default-debian-9-2018-3-py2
# - INSTANCE: default-ubuntu-1604-2018-3-py2 # - INSTANCE: default-ubuntu-1604-2018-3-py2
# - INSTANCE: default-centos-7-2018-3-py2 # - INSTANCE: default-centos-7-2018-3-py2
- INSTANCE: default-fedora-29-2018-3-py2 - INSTANCE: default-fedora-29-2018-3-py2
- INSTANCE: default-opensuse-leap-42-2018-3-py2 - INSTANCE: default-opensuse-leap-15-2018-3-py2
# - INSTANCE: default-amazonlinux-2-2018-3-py2
# - INSTANCE: default-debian-8-2017-7-py2 # - INSTANCE: default-debian-8-2017-7-py2
# - INSTANCE: default-ubuntu-1604-2017-7-py2 # - INSTANCE: default-ubuntu-1604-2017-7-py2
- INSTANCE: default-centos-6-2017-7-py2 - INSTANCE: default-centos-6-2017-7-py2
# - INSTANCE: default-fedora-28-2017-7-py2 # - INSTANCE: default-fedora-29-2017-7-py2
# - INSTANCE: default-opensuse-leap-42-2017-7-py2 # - INSTANCE: default-opensuse-leap-15-2017-7-py2
# - INSTANCE: default-amazonlinux-2-2017-7-py2
script: script:
- bin/kitchen verify ${INSTANCE} - bin/kitchen verify ${INSTANCE}

39
kitchen.yml
View file

@ -12,9 +12,9 @@ driver:
# the `env.matrix` instances defined in `.travis.yml` # the `env.matrix` instances defined in `.travis.yml`
platforms: platforms:
## SALT `develop` ## SALT `develop`
- name: debian-9-develop-py3 - name: debian-10-develop-py3
driver: driver:
image: netmanagers/salt-develop-py3:debian-9 image: netmanagers/salt-develop-py3:debian-10
provision_command: provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
@ -30,9 +30,9 @@ platforms:
provision_command: provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
- name: fedora-29-develop-py3 - name: fedora-30-develop-py3
driver: driver:
image: netmanagers/salt-develop-py3:fedora-29 image: netmanagers/salt-develop-py3:fedora-30
provision_command: provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
@ -43,6 +43,12 @@ platforms:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
- name: amazonlinux-2-develop-py2
driver:
image: netmanagers/salt-develop-py2:amazonlinux-2
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
## SALT `2019.2` ## SALT `2019.2`
- name: debian-9-2019-2-py3 - name: debian-9-2019-2-py3
@ -54,13 +60,16 @@ platforms:
- name: centos-7-2019-2-py3 - name: centos-7-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:centos-7 image: netmanagers/salt-2019.2-py3:centos-7
- name: fedora-29-2019-2-py3 - name: fedora-30-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:fedora-29 image: netmanagers/salt-2019.2-py3:fedora-30
- name: opensuse-leap-15-2019-2-py3 - name: opensuse-leap-15-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:opensuse-leap-15 image: netmanagers/salt-2019.2-py3:opensuse-leap-15
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
- name: amazonlinux-2-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:amazonlinux-2
## SALT `2018.3` ## SALT `2018.3`
- name: debian-9-2018-3-py2 - name: debian-9-2018-3-py2
@ -75,10 +84,13 @@ platforms:
- name: fedora-29-2018-3-py2 - name: fedora-29-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:fedora-29 image: netmanagers/salt-2018.3-py2:fedora-29
- name: opensuse-leap-42-2018-3-py2 - name: opensuse-leap-15-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:opensuse-leap-42 image: netmanagers/salt-2018.3-py2:opensuse-leap-15
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
- name: amazonlinux-2-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:amazonlinux-2
## SALT `2017.7` ## SALT `2017.7`
- name: debian-8-2017-7-py2 - name: debian-8-2017-7-py2
@ -91,13 +103,16 @@ platforms:
driver: driver:
image: netmanagers/salt-2017.7-py2:centos-6 image: netmanagers/salt-2017.7-py2:centos-6
run_command: /sbin/init run_command: /sbin/init
- name: fedora-28-2017-7-py2 - name: fedora-29-2017-7-py2
driver: driver:
image: netmanagers/salt-2017.7-py2:fedora-28 image: netmanagers/salt-2017.7-py2:fedora-29
- name: opensuse-leap-42-2017-7-py2 - name: opensuse-leap-15-2017-7-py2
driver: driver:
image: netmanagers/salt-2017.7-py2:opensuse-leap-42 image: netmanagers/salt-2017.7-py2:opensuse-leap-15
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
- name: amazonlinux-2-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:amazonlinux-2
provisioner: provisioner:
name: salt_solo name: salt_solo

6
test/integration/default/controls/config_spec.rb
View file

@ -17,7 +17,7 @@ config = '/etc/bind/named.conf'
# Override by OS # Override by OS
case os[:name] case os[:name]
when 'arch','redhat', 'centos', 'fedora' when 'arch','redhat', 'centos', 'fedora', 'amazon'
conf_user = 'named' conf_user = 'named'
conf_group = 'named' conf_group = 'named'
keys_group = 'root' keys_group = 'root'
@ -48,7 +48,7 @@ end
case os[:name] case os[:name]
when 'arch', 'ubuntu' when 'arch', 'ubuntu'
log_directory = '/var/log/named' log_directory = '/var/log/named'
when 'redhat', 'centos', 'fedora' when 'redhat', 'centos', 'fedora', 'amazon'
log_directory = '/var/named/data' log_directory = '/var/named/data'
when 'suse', 'opensuse' when 'suse', 'opensuse'
log_directory = '/var/log' log_directory = '/var/log'
@ -101,7 +101,7 @@ end
# RHEL: Doesn't use .options and has rfc1912.zones # RHEL: Doesn't use .options and has rfc1912.zones
# Debian: Uses .options # Debian: Uses .options
case os[:name] case os[:name]
when 'arch','redhat', 'centos', 'fedora' when 'arch','redhat', 'centos', 'fedora', 'amazon'
control 'File ' + config do control 'File ' + config do
title 'should exist' title 'should exist'
describe file(config) do describe file(config) do

2
test/integration/default/controls/pkgs_spec.rb
View file

@ -6,7 +6,7 @@ when 'arch'
bind-tools bind-tools
dnssec-tools dnssec-tools
) )
when 'redhat', 'centos', 'fedora' when 'redhat', 'centos', 'fedora', 'amazon'
os_packages = %w(bind) os_packages = %w(bind)
when 'suse', 'opensuse' when 'suse', 'opensuse'
os_packages = %w(bind) os_packages = %w(bind)

2
test/integration/default/controls/service_spec.rb
View file

@ -1,6 +1,6 @@
case os[:name] case os[:name]
when 'arch','redhat', 'centos', 'fedora' when 'arch','redhat', 'centos', 'fedora', 'amazon'
service = 'named' service = 'named'
when 'suse', 'opensuse' when 'suse', 'opensuse'
service = 'named' service = 'named'

4
test/integration/default/controls/zones_spec.rb
View file

@ -16,7 +16,7 @@ config = '/etc/bind/named.conf'
# Override by OS # Override by OS
case os[:name] case os[:name]
when 'arch','redhat', 'centos', 'fedora' when 'arch','redhat', 'centos', 'fedora', 'amazon'
conf_user = 'named' conf_user = 'named'
conf_group = 'named' conf_group = 'named'
keys_group = 'root' keys_group = 'root'
@ -35,7 +35,7 @@ end
case os[:name] case os[:name]
when 'arch', 'ubuntu' when 'arch', 'ubuntu'
log_directory = '/var/log/named' log_directory = '/var/log/named'
when 'redhat', 'centos', 'fedora' when 'redhat', 'centos', 'fedora', 'amazon'
log_directory = '/var/named/data' log_directory = '/var/named/data'
end end