Skip to content

Commit

Permalink
ci(kitchen+inspec): add Amazonlinux test suite
Browse files Browse the repository at this point in the history
  • Loading branch information
daks authored and myii committed Jan 15, 2020
1 parent 58b1209 commit edb0d73
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 12 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,26 @@ env:
# - INSTANCE: ubuntu-ubuntu-1804-develop-py3
# - INSTANCE: centos-centos-7-develop-py3
# - INSTANCE: fedora30-fedora-30-develop-py3
- INSTANCE: suse-opensuse-leap-15-develop-py3
# - INSTANCE: default-amazonlinux-2-develop-py2
# - INSTANCE: suse-opensuse-leap-15-develop-py3
- INSTANCE: amazonlinux-amazonlinux-2-develop-py2
# - INSTANCE: debian-debian-9-2019-2-py3
# - INSTANCE: ubuntu-ubuntu-1804-2019-2-py3
# - INSTANCE: centos-centos-7-2019-2-py3
# - INSTANCE: fedora30-fedora-30-2019-2-py3
- INSTANCE: suse-opensuse-leap-15-2019-2-py3
# - INSTANCE: default-amazonlinux-2-2019-2-py2
# - INSTANCE: suse-opensuse-leap-15-2019-2-py3
- INSTANCE: amazonlinux-amazonlinux-2-2019-2-py2
# - INSTANCE: debian-debian-9-2018-3-py2
# - INSTANCE: ubuntu-ubuntu-1604-2018-3-py2
# - INSTANCE: centos-centos-7-2018-3-py2
# - INSTANCE: fedora29-fedora-29-2018-3-py2
- INSTANCE: suse-opensuse-leap-15-2018-3-py2
# - INSTANCE: default-amazonlinux-2-2018-3-py2
# - INSTANCE: suse-opensuse-leap-15-2018-3-py2
- INSTANCE: amazonlinux-amazonlinux-2-2018-3-py2
# - INSTANCE: debian-debian-8-2017-7-py2
# - INSTANCE: ubuntu-ubuntu-1604-2017-7-py2
# - INSTANCE: centos-centos-6-2017-7-py2
# - INSTANCE: fedora29-fedora-29-2017-7-py2
- INSTANCE: suse-opensuse-leap-15-2017-7-py2
# - INSTANCE: default-amazonlinux-2-2017-7-py2
# - INSTANCE: suse-opensuse-leap-15-2017-7-py2
- INSTANCE: amazonlinux-amazonlinux-2-2017-7-py2

script:
- bin/kitchen verify ${INSTANCE}
Expand Down
34 changes: 30 additions & 4 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,17 +243,43 @@ suites:
inspec_tests:
- path: test/integration/default

- name: amazonlinux
includes:
- amazonlinux-2-develop-py2
- amazonlinux-2-2019-2-py2
- amazonlinux-2-2018-3-py2
- amazonlinux-2-2017-7-py2
provisioner:
dependencies:
- name: epel
repo: git
source: https://github.com/saltstack-formulas/epel-formula.git
state_top:
base:
'*':
- packages
pillars:
top.sls:
base:
'*':
- packages
pillars_from_files:
packages.sls: test/salt/pillar/pillar.example.amazonlinux
verifier:
inspec_tests:
- path: test/integration/default

- name: suse
includes:
- opensuse-leap-15-develop-py3
- opensuse-leap-15-2019-2-py3
- opensuse-leap-15-2018-3-py2
- opensuse-leap-15-2017-7-py2
provisioner:
dependencies:
- name: epel
repo: git
source: https://github.com/saltstack-formulas/epel-formula.git
# dependencies:
# - name: epel
# repo: git
# source: https://github.com/saltstack-formulas/epel-formula.git
state_top:
base:
'*':
Expand Down
4 changes: 4 additions & 0 deletions test/integration/default/controls/pkgs_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
'iotop': '0.6-'
}
lock_file = '/var/lib/dpkg/status'
when 'amazon'
common_packages.delete('fail2ban')
os_packages = ['git']
held_packages = []
end

## FIXME - not testing Held packages
Expand Down
33 changes: 33 additions & 0 deletions test/salt/pillar/pillar.example.amazonlinux
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
packages:
pkgs:
# held:
# - alien
# - iotop
wanted:
- git
- less
- bc
- curl
unwanted:
- avahi-daemon
required:
pkgs:
- git
- yum-plugin-versionlock
pips:
wanted:
- attrs
unwanted:
- campbel
- reverse_geocode
- indy-crypto
gems:
wanted:
- progressbar
- minitest
unwanted:
- diff-lcs
- kitchen-vagrant
- kwalify
remote_pkgs:
zoom: 'https://zoom.us/client/latest/zoom_x86_64.rpm'

0 comments on commit edb0d73

Please sign in to comment.