diff --git a/.travis.yml b/.travis.yml index b381bd3..6b5911f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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} diff --git a/kitchen.yml b/kitchen.yml index fbdfb23..9c467f6 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -243,6 +243,32 @@ 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 @@ -250,10 +276,10 @@ suites: - 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: '*': diff --git a/test/integration/default/controls/pkgs_spec.rb b/test/integration/default/controls/pkgs_spec.rb index eac020f..dc6495c 100644 --- a/test/integration/default/controls/pkgs_spec.rb +++ b/test/integration/default/controls/pkgs_spec.rb @@ -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 diff --git a/test/salt/pillar/pillar.example.amazonlinux b/test/salt/pillar/pillar.example.amazonlinux new file mode 100644 index 0000000..9850fb9 --- /dev/null +++ b/test/salt/pillar/pillar.example.amazonlinux @@ -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'