From 433a2c1597fca67762cc41617d1a4056b6b6adc3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 1 May 2020 07:36:27 +0100 Subject: [PATCH] ci(kitchen+travis): adjust matrix to add `3000.2` & remove `2018.3` * Semi-automated using https://github.com/myii/ssf-formula/pull/166 --- .travis.yml | 30 ++++++------ kitchen.yml | 128 ++++++++++++++++++++-------------------------------- 2 files changed, 65 insertions(+), 93 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56fb832..43cfc7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,27 +58,27 @@ jobs: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - - env: INSTANCE=v3000-py3-debian-10-3000-1-py3 - - env: INSTANCE=v3000-py3-ubuntu-1804-3000-1-py3 - - env: INSTANCE=v3000-py3-centos-8-3000-1-py3 - - env: INSTANCE=v3000-py3-fedora-31-3000-1-py3 - # - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-1-py3 - - env: INSTANCE=v3000-py3-amazonlinux-2-3000-1-py3 - # - env: INSTANCE=v3000-py2-arch-base-latest-3000-1-py2 + - env: INSTANCE=v3000-py3-debian-10-3000-2-py3 + # - env: INSTANCE=v3000-py3-debian-9-3000-2-py3 + # - env: INSTANCE=v3000-py3-ubuntu-1804-3000-2-py3 + - env: INSTANCE=v3000-py3-centos-8-3000-2-py3 + # - env: INSTANCE=v3000-py3-centos-7-3000-2-py3 + - env: INSTANCE=v3000-py3-fedora-31-3000-2-py3 + # - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-2-py3 + - env: INSTANCE=v3000-py3-amazonlinux-2-3000-2-py3 + - env: INSTANCE=v3000-py2-ubuntu-1804-3000-2-py2 + # - env: INSTANCE=v3000-py2-ubuntu-1604-3000-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-ubuntu-1604-2019-2-py3 # - env: INSTANCE=v201902-py3-centos-8-2019-2-py3 + - env: INSTANCE=v201902-py3-centos-7-2019-2-py3 + # - env: INSTANCE=v201902-py3-fedora-31-2019-2-py3 - env: INSTANCE=v201902-py3-opensuse-leap-151-2019-2-py3 # - env: INSTANCE=v201902-py3-amazonlinux-2-2019-2-py3 - - env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2 - # - env: INSTANCE=v201902-py2-centos-7-2019-2-py2 - # - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-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-1-2018-3-py2 - # - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2 + - env: INSTANCE=v201902-py2-centos-6-2019-2-py2 + # - env: INSTANCE=v201902-py2-amazonlinux-1-2019-2-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 1e7335b..6855b9b 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -11,34 +11,42 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` platforms: - ## SALT `3000.1` - - name: debian-10-3000-1-py3 + ## SALT `3000.2` + - name: debian-10-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:debian-10 - - name: ubuntu-1804-3000-1-py3 + image: netmanagers/salt-3000.2-py3:debian-10 + - name: debian-9-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:ubuntu-18.04 - - name: centos-8-3000-1-py3 + image: netmanagers/salt-3000.2-py3:debian-9 + - name: ubuntu-1804-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:centos-8 - - name: fedora-31-3000-1-py3 + image: netmanagers/salt-3000.2-py3:ubuntu-18.04 + - name: centos-8-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:fedora-31 - - name: opensuse-leap-151-3000-1-py3 + image: netmanagers/salt-3000.2-py3:centos-8 + - name: centos-7-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:opensuse-leap-15.1 + image: netmanagers/salt-3000.2-py3:centos-7 + - name: fedora-31-3000-2-py3 + driver: + image: netmanagers/salt-3000.2-py3:fedora-31 + - name: opensuse-leap-151-3000-2-py3 + driver: + image: netmanagers/salt-3000.2-py3:opensuse-leap-15.1 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3000-1-py3 + - name: amazonlinux-2-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:amazonlinux-2 - - name: arch-base-latest-3000-1-py2 + image: netmanagers/salt-3000.2-py3:amazonlinux-2 + - name: ubuntu-1804-3000-2-py2 driver: - image: netmanagers/salt-3000.1-py2:arch-base-latest - run_command: /usr/lib/systemd/systemd + image: netmanagers/salt-3000.2-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-2-py2 + driver: + image: netmanagers/salt-3000.2-py2:ubuntu-16.04 ## SALT `2019.2` - name: debian-10-2019-2-py3 @@ -50,9 +58,15 @@ platforms: - name: ubuntu-1804-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:ubuntu-18.04 + - name: ubuntu-1604-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:ubuntu-16.04 - name: centos-8-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:centos-8 + - name: centos-7-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:centos-7 - name: fedora-31-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:fedora-31 @@ -67,35 +81,14 @@ platforms: - name: amazonlinux-2-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:amazonlinux-2 - - name: ubuntu-1804-2019-2-py2 + - name: centos-6-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: arch-base-latest-2019-2-py2 - driver: - image: netmanagers/salt-2019.2-py2:arch-base-latest - run_command: /usr/lib/systemd/systemd - - ## SALT `2018.3` - - name: debian-9-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:debian-9 - - name: ubuntu-1604-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:ubuntu-16.04 - - name: centos-7-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:centos-7 - - name: amazonlinux-1-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:amazonlinux-1 + image: netmanagers/salt-2019.2-py2:centos-6 run_command: /sbin/init - - name: arch-base-latest-2018-3-py2 + - name: amazonlinux-1-2019-2-py2 driver: - image: netmanagers/salt-2018.3-py2:arch-base-latest - run_command: /usr/lib/systemd/systemd + image: netmanagers/salt-2019.2-py2:amazonlinux-1 + run_command: /sbin/init provisioner: name: salt_solo @@ -118,12 +111,14 @@ verifier: suites: - name: v3000-py3 includes: - - debian-10-3000-1-py3 - - ubuntu-1804-3000-1-py3 - - centos-8-3000-1-py3 - - fedora-31-3000-1-py3 - - opensuse-leap-151-3000-1-py3 - - amazonlinux-2-3000-1-py3 + - debian-10-3000-2-py3 + - debian-9-3000-2-py3 + - ubuntu-1804-3000-2-py3 + - centos-8-3000-2-py3 + - centos-7-3000-2-py3 + - fedora-31-3000-2-py3 + - opensuse-leap-151-3000-2-py3 + - amazonlinux-2-3000-2-py3 provisioner: state_top: base: @@ -145,7 +140,8 @@ suites: - path: test/integration/v3000-py3 - name: v3000-py2 includes: - - arch-base-latest-3000-1-py2 + - ubuntu-1804-3000-2-py2 + - ubuntu-1604-3000-2-py2 provisioner: state_top: base: @@ -170,7 +166,10 @@ suites: - debian-10-2019-2-py3 - debian-9-2019-2-py3 - ubuntu-1804-2019-2-py3 + - ubuntu-1604-2019-2-py3 - centos-8-2019-2-py3 + - centos-7-2019-2-py3 + - fedora-31-2019-2-py3 - opensuse-leap-151-2019-2-py3 - amazonlinux-2-2019-2-py3 provisioner: @@ -194,9 +193,8 @@ suites: - path: test/integration/v201902-py3 - name: v201902-py2 includes: - - ubuntu-1804-2019-2-py2 - - centos-7-2019-2-py2 - - arch-base-latest-2019-2-py2 + - centos-6-2019-2-py2 + - amazonlinux-1-2019-2-py2 provisioner: state_top: base: @@ -216,29 +214,3 @@ suites: verifier: inspec_tests: - path: test/integration/v201902-py2 - - name: v201803-py2 - includes: - - debian-9-2018-3-py2 - - ubuntu-1604-2018-3-py2 - - centos-7-2018-3-py2 - - amazonlinux-1-2018-3-py2 - - arch-base-latest-2018-3-py2 - provisioner: - state_top: - base: - '*': - - salt.pkgrepo - - salt.master - - salt.minion - pillars: - top.sls: - base: - '*': - - salt - - v201803-py2 - pillars_from_files: - salt.sls: test/salt/pillar/salt.sls - v201803-py2.sls: test/salt/pillar/v201803-py2.sls - verifier: - inspec_tests: - - path: test/integration/v201803-py2