From 10e2ce07a4293ad46d785bcbc16b822280f17142 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 13 Feb 2020 10:35:02 +0000 Subject: [PATCH] ci(kitchen+travis+inspec): fix `amazonlinux-2-py3` [skip ci] * Semi-automated using https://github.com/myii/ssf-formula/pull/128 * Tested: https://travis-ci.org/myii/salt-formula/jobs/649882733 --- .travis.yml | 2 +- kitchen.yml | 2 +- test/integration/v201902-py3/controls/pkgs_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f67f0ad..c5835de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ jobs: # - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2 - env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2 # - env: INSTANCE=v201902-py2-centos-7-2019-2-py2 - - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py3 + - env: INSTANCE=v201902-py3-amazonlinux-2-2019-2-py3 # - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-py2 - env: INSTANCE=v201902-py3-debian-10-2019-2-py3 # - env: INSTANCE=v201902-py3-debian-9-2019-2-py3 diff --git a/kitchen.yml b/kitchen.yml index 65191e7..6c69f74 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -114,6 +114,7 @@ suites: - ubuntu-1804-2019-2-py3 - centos-8-2019-2-py3 - opensuse-leap-151-2019-2-py3 + - amazonlinux-2-2019-2-py3 provisioner: state_top: base: @@ -137,7 +138,6 @@ suites: includes: - ubuntu-1804-2019-2-py2 - centos-7-2019-2-py2 - - amazonlinux-2-2019-2-py3 - arch-base-latest-2019-2-py2 provisioner: state_top: diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb index c742d6d..ffe2dca 100644 --- a/test/integration/v201902-py3/controls/pkgs_spec.rb +++ b/test/integration/v201902-py3/controls/pkgs_spec.rb @@ -5,7 +5,7 @@ version = when 'redhat' case platform[:name] when 'amazon' - '2019.2.2-1.el7' + '2019.2.3-1.amzn2' when 'centos' '2019.2.3-1.el8' end