From acbc238877e3d2b1d3d3689d19c295d3a1abfd70 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 29 Oct 2019 11:33:56 +0000 Subject: [PATCH 1/2] test(pkgs_spec): update for `2019.2.2` release * https://docs.saltstack.com/en/latest/topics/releases/2019.2.2.html --- test/integration/v201902-py2/controls/pkgs_spec.rb | 8 ++------ test/integration/v201902-py3/controls/pkgs_spec.rb | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/test/integration/v201902-py2/controls/pkgs_spec.rb b/test/integration/v201902-py2/controls/pkgs_spec.rb index 718ddda..2c57bc6 100644 --- a/test/integration/v201902-py2/controls/pkgs_spec.rb +++ b/test/integration/v201902-py2/controls/pkgs_spec.rb @@ -3,13 +3,9 @@ version = case platform[:family] when 'redhat' - '2019.2.0-1.el7' - when 'fedora' - '2019.2.0-1.fc30' - when 'suse' - '2019.2.0-lp151.5.3.1' + '2019.2.2-1.el7' when 'debian' - '2019.2.0+ds-1' + '2019.2.2+ds-1' end control 'salt packages' do diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb index cbf0927..f25bba5 100644 --- a/test/integration/v201902-py3/controls/pkgs_spec.rb +++ b/test/integration/v201902-py3/controls/pkgs_spec.rb @@ -5,16 +5,16 @@ version = when 'redhat' case platform[:name] when 'amazon' - '2019.2.0-1.el7' + '2019.2.2-1.el7' when 'centos' - '2019.2.0-2.el7' + '2019.2.2-1.el8' end when 'fedora' - '2019.2.0-1.fc30' + '2019.2.1rc0-3.fc31' when 'suse' '2019.2.0-lp151.5.3.1' when 'debian' - '2019.2.0+ds-1' + '2019.2.2+ds-1' end control 'salt packages' do From b6e3a832295b70ff3609cd3a022d16239e416c2d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 29 Oct 2019 21:40:51 +0000 Subject: [PATCH 2/2] ci(kitchen+travis): upgrade matrix after `2019.2.2` release * Automated using https://github.com/myii/ssf-formula/pull/86 --- .travis.yml | 16 +++++++--------- kitchen.yml | 50 +++++++++++++------------------------------------- 2 files changed, 20 insertions(+), 46 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3841a83..b58ebdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ jobs: script: # Install and run `salt-lint` - pip install --user salt-lint - - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$' + - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$' | xargs -I {} salt-lint {} # Install and run `yamllint` # Need at least `v1.17.0` for the `yaml-files` setting @@ -60,22 +60,20 @@ jobs: - env: INSTANCE=v201707-py2-centos-6-2017-7-py2 # - env: INSTANCE=v201707-py2-amazonlinux-2-2017-7-py2 # - env: INSTANCE=v201707-py2-arch-base-latest-2017-7-py2 - # - env: INSTANCE=v201803-py2-debian-9-2018-3-py2 + - env: INSTANCE=v201803-py2-debian-9-2018-3-py2 # - env: INSTANCE=v201803-py2-ubuntu-1604-2018-3-py2 - env: INSTANCE=v201803-py2-centos-7-2018-3-py2 - - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2 + # - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2 # - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2 - - env: INSTANCE=v201902-py2-debian-9-2019-2-py2 - env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2 # - env: INSTANCE=v201902-py2-centos-7-2019-2-py2 - # - env: INSTANCE=v201902-py2-opensuse-leap-15-2019-2-py2 - # - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2 + - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2 # - 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 # - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3 - # - env: INSTANCE=v201902-py3-centos-7-2019-2-py3 - - env: INSTANCE=v201902-py3-fedora-30-2019-2-py3 - - env: INSTANCE=v201902-py3-opensuse-leap-15-2019-2-py3 + # - env: INSTANCE=v201902-py3-centos-8-2019-2-py3 + - env: INSTANCE=v201902-py3-opensuse-leap-151-2019-2-py3 ## Define the release stage that runs `semantic-release` - stage: release diff --git a/kitchen.yml b/kitchen.yml index fe3c661..db09584 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -49,30 +49,12 @@ platforms: run_command: /usr/lib/systemd/systemd ## SALT `2019.2` - - name: debian-9-2019-2-py2 - driver: - image: netmanagers/salt-2019.2-py2:debian-9 - name: ubuntu-1804-2019-2-py2 driver: image: netmanagers/salt-2019.2-py2:ubuntu-18.04 - name: centos-7-2019-2-py2 driver: image: netmanagers/salt-2019.2-py2:centos-7 - - name: opensuse-leap-15-2019-2-py2 - driver: - image: opensuse/leap:15 - provision_command: - # yamllint disable-line rule:line-length - - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip - - systemctl enable sshd.service - run_command: /usr/lib/systemd/systemd - provisioner: - salt_bootstrap_options: -XdPfrq -x python2 git 2019.2 - salt_install: bootstrap - # Workaround to avoid intermittent failures on `opensuse-leap-15`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 - name: amazonlinux-2-2019-2-py2 driver: image: netmanagers/salt-2019.2-py2:amazonlinux-2 @@ -80,30 +62,26 @@ platforms: driver: image: netmanagers/salt-2019.2-py2:arch-base-latest run_command: /usr/lib/systemd/systemd + - name: debian-10-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:debian-10 - name: debian-9-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:debian-9 - name: ubuntu-1804-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:ubuntu-18.04 - - name: centos-7-2019-2-py3 + - name: centos-8-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:centos-7 - - name: fedora-30-2019-2-py3 + image: netmanagers/salt-2019.2-py3:centos-8 + - name: fedora-31-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:fedora-30 - - name: opensuse-leap-15-2019-2-py3 + image: netmanagers/salt-2019.2-py3:fedora-31 + - name: opensuse-leap-151-2019-2-py3 driver: - image: opensuse/leap:15 - provision_command: - # yamllint disable-line rule:line-length - - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip - - systemctl enable sshd.service + image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1 run_command: /usr/lib/systemd/systemd - provisioner: - salt_bootstrap_options: -XdPfrq -x python3 git 2019.2 - salt_install: bootstrap - # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 @@ -129,11 +107,11 @@ verifier: suites: - name: v201902-py3 includes: + - debian-10-2019-2-py3 - debian-9-2019-2-py3 - ubuntu-1804-2019-2-py3 - - centos-7-2019-2-py3 - - fedora-30-2019-2-py3 - - opensuse-leap-15-2019-2-py3 + - centos-8-2019-2-py3 + - opensuse-leap-151-2019-2-py3 provisioner: state_top: base: @@ -155,10 +133,8 @@ suites: - path: test/integration/v201902-py3 - name: v201902-py2 includes: - - debian-9-2019-2-py2 - ubuntu-1804-2019-2-py2 - centos-7-2019-2-py2 - - opensuse-leap-15-2019-2-py2 - amazonlinux-2-2019-2-py2 - arch-base-latest-2019-2-py2 provisioner: