From 59684c6f8a158c64efde46173e34373ad7204a30 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 19 Aug 2019 11:54:44 +0100 Subject: [PATCH 1/2] test(inspec): improve to work on `amazon` as well --- test/integration/default/controls/config_spec.rb | 6 +++--- test/integration/default/controls/pkgs_spec.rb | 2 +- test/integration/default/controls/service_spec.rb | 2 +- test/integration/default/controls/zones_spec.rb | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config_spec.rb index 4f35fd3..22f7351 100644 --- a/test/integration/default/controls/config_spec.rb +++ b/test/integration/default/controls/config_spec.rb @@ -17,7 +17,7 @@ config = '/etc/bind/named.conf' # Override by OS case os[:name] -when 'arch','redhat', 'centos', 'fedora' +when 'arch','redhat', 'centos', 'fedora', 'amazon' conf_user = 'named' conf_group = 'named' keys_group = 'root' @@ -48,7 +48,7 @@ end case os[:name] when 'arch', 'ubuntu' log_directory = '/var/log/named' -when 'redhat', 'centos', 'fedora' +when 'redhat', 'centos', 'fedora', 'amazon' log_directory = '/var/named/data' when 'suse', 'opensuse' log_directory = '/var/log' @@ -101,7 +101,7 @@ end # RHEL: Doesn't use .options and has rfc1912.zones # Debian: Uses .options case os[:name] -when 'arch','redhat', 'centos', 'fedora' +when 'arch','redhat', 'centos', 'fedora', 'amazon' control 'File ' + config do title 'should exist' describe file(config) do diff --git a/test/integration/default/controls/pkgs_spec.rb b/test/integration/default/controls/pkgs_spec.rb index bbef2b5..2d487a2 100644 --- a/test/integration/default/controls/pkgs_spec.rb +++ b/test/integration/default/controls/pkgs_spec.rb @@ -6,7 +6,7 @@ when 'arch' bind-tools dnssec-tools ) -when 'redhat', 'centos', 'fedora' +when 'redhat', 'centos', 'fedora', 'amazon' os_packages = %w(bind) when 'suse', 'opensuse' os_packages = %w(bind) diff --git a/test/integration/default/controls/service_spec.rb b/test/integration/default/controls/service_spec.rb index 6df7a66..04867c9 100644 --- a/test/integration/default/controls/service_spec.rb +++ b/test/integration/default/controls/service_spec.rb @@ -1,6 +1,6 @@ case os[:name] -when 'arch','redhat', 'centos', 'fedora' +when 'arch','redhat', 'centos', 'fedora', 'amazon' service = 'named' when 'suse', 'opensuse' service = 'named' diff --git a/test/integration/default/controls/zones_spec.rb b/test/integration/default/controls/zones_spec.rb index 77af62a..b0cfdc5 100644 --- a/test/integration/default/controls/zones_spec.rb +++ b/test/integration/default/controls/zones_spec.rb @@ -16,7 +16,7 @@ config = '/etc/bind/named.conf' # Override by OS case os[:name] -when 'arch','redhat', 'centos', 'fedora' +when 'arch','redhat', 'centos', 'fedora', 'amazon' conf_user = 'named' conf_group = 'named' keys_group = 'root' @@ -35,7 +35,7 @@ end case os[:name] when 'arch', 'ubuntu' log_directory = '/var/log/named' -when 'redhat', 'centos', 'fedora' +when 'redhat', 'centos', 'fedora', 'amazon' log_directory = '/var/named/data' end From 3a4d4e8d04e9f968411284d48adc97b32de7fe6b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 28 Aug 2019 07:15:08 +0100 Subject: [PATCH 2/2] ci(kitchen+travis): replace EOL pre-salted images * Automated using https://github.com/myii/ssf-formula/pull/16 --- .travis.yml | 18 +++++++++++------- kitchen.yml | 39 +++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7a5123..061a67e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,26 +19,30 @@ services: # the `platforms` defined in `kitchen.yml` env: matrix: - - INSTANCE: default-debian-9-develop-py3 + - INSTANCE: default-debian-10-develop-py3 # - INSTANCE: default-ubuntu-1804-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-amazonlinux-2-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-29-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-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-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-ubuntu-1604-2017-7-py2 - INSTANCE: default-centos-6-2017-7-py2 - # - INSTANCE: default-fedora-28-2017-7-py2 - # - INSTANCE: default-opensuse-leap-42-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 script: - bin/kitchen verify ${INSTANCE} diff --git a/kitchen.yml b/kitchen.yml index c0a366b..f6bbcee 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -12,9 +12,9 @@ driver: # the `env.matrix` instances defined in `.travis.yml` platforms: ## SALT `develop` - - name: debian-9-develop-py3 + - name: debian-10-develop-py3 driver: - image: netmanagers/salt-develop-py3:debian-9 + image: netmanagers/salt-develop-py3:debian-10 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop @@ -30,9 +30,9 @@ platforms: provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - - name: fedora-29-develop-py3 + - name: fedora-30-develop-py3 driver: - image: netmanagers/salt-develop-py3:fedora-29 + image: netmanagers/salt-develop-py3:fedora-30 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop @@ -43,6 +43,12 @@ platforms: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop 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` - name: debian-9-2019-2-py3 @@ -54,13 +60,16 @@ platforms: - name: centos-7-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:centos-7 - - name: fedora-29-2019-2-py3 + - name: fedora-30-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:fedora-29 + image: netmanagers/salt-2019.2-py3:fedora-30 - name: opensuse-leap-15-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:opensuse-leap-15 run_command: /usr/lib/systemd/systemd + - name: amazonlinux-2-2019-2-py2 + driver: + image: netmanagers/salt-2019.2-py2:amazonlinux-2 ## SALT `2018.3` - name: debian-9-2018-3-py2 @@ -75,10 +84,13 @@ platforms: - name: fedora-29-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:fedora-29 - - name: opensuse-leap-42-2018-3-py2 + - name: opensuse-leap-15-2018-3-py2 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 + - name: amazonlinux-2-2018-3-py2 + driver: + image: netmanagers/salt-2018.3-py2:amazonlinux-2 ## SALT `2017.7` - name: debian-8-2017-7-py2 @@ -91,13 +103,16 @@ platforms: driver: image: netmanagers/salt-2017.7-py2:centos-6 run_command: /sbin/init - - name: fedora-28-2017-7-py2 + - name: fedora-29-2017-7-py2 driver: - image: netmanagers/salt-2017.7-py2:fedora-28 - - name: opensuse-leap-42-2017-7-py2 + image: netmanagers/salt-2017.7-py2:fedora-29 + - name: opensuse-leap-15-2017-7-py2 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 + - name: amazonlinux-2-2017-7-py2 + driver: + image: netmanagers/salt-2017.7-py2:amazonlinux-2 provisioner: name: salt_solo