From 93289f6df12a675eafcf719ced7363e350b9651b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 19 Nov 2021 22:08:25 +0000 Subject: [PATCH] ci(kitchen+gitlab): adjust matrix to add `3004` * Semi-automated using https://github.com/myii/ssf-formula/pull/385 --- .github/workflows/kitchen.vagrant.yml | 1 - .gitlab-ci.yml | 66 +++++++---- .travis.yml | 56 ++++++--- kitchen.vagrant.yml | 9 -- kitchen.yml | 164 ++++++++++++++++++++++++++ test/salt/pillar/top.sls | 2 + 6 files changed, 251 insertions(+), 47 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index ccb2537..a7aba6c 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -19,7 +19,6 @@ jobs: - default-freebsd-130-3003-1-py3 - default-freebsd-122-3003-1-py3 - default-openbsd-69-3002-6-py3 - # - default-openbsd-68-3001-1-py3 - default-windows-10-latest-py3 - default-windows-81-latest-py3 steps: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b14235f..b0cfbb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,6 +135,7 @@ rubocop: # default-debian-9-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} +# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'} # default-centos-8-tiamat-py3: {extends: '.test_instance'} # default-centos-7-tiamat-py3: {extends: '.test_instance'} # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} @@ -147,13 +148,14 @@ rubocop: # default-debian-9-master-py3: {extends: '.test_instance'} # default-ubuntu-2004-master-py3: {extends: '.test_instance'} # default-ubuntu-1804-master-py3: {extends: '.test_instance'} +# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} # default-centos-8-master-py3: {extends: '.test_instance'} # default-centos-7-master-py3: {extends: '.test_instance'} # default-fedora-34-master-py3: {extends: '.test_instance'} # default-fedora-33-master-py3: {extends: '.test_instance'} # default-opensuse-leap-153-master-py3: {extends: '.test_instance'} # default-opensuse-leap-152-master-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} # default-amazonlinux-2-master-py3: {extends: '.test_instance'} # default-oraclelinux-8-master-py3: {extends: '.test_instance'} # default-oraclelinux-7-master-py3: {extends: '.test_instance'} @@ -162,45 +164,67 @@ rubocop: # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-almalinux-8-master-py3: {extends: '.test_instance'} # default-rockylinux-8-master-py3: {extends: '.test_instance'} -default-debian-11-3003-3-py3: {extends: '.test_instance_failure_permitted'} -# default-debian-10-3003-3-py3: {extends: '.test_instance'} +default-debian-11-3004-0-py3: {extends: '.test_instance'} +# default-debian-10-3004-0-py3: {extends: '.test_instance'} +# default-debian-9-3004-0-py3: {extends: '.test_instance'} +default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'} +default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'} +default-centos-8-3004-0-py3: {extends: '.test_instance'} +# default-centos-7-3004-0-py3: {extends: '.test_instance'} +# default-fedora-34-3004-0-py3: {extends: '.test_instance'} +# default-fedora-33-3004-0-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'} +default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'} +default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'} +default-arch-base-latest-3004-0-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'} +default-almalinux-8-3004-0-py3: {extends: '.test_instance'} +default-rockylinux-8-3004-0-py3: {extends: '.test_instance'} +# default-debian-11-3003-3-py3: {extends: '.test_instance'} +default-debian-10-3003-3-py3: {extends: '.test_instance'} # default-debian-9-3003-3-py3: {extends: '.test_instance'} -default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} -default-centos-8-3003-3-py3: {extends: '.test_instance'} -# default-centos-7-3003-3-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} +default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} +# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'} +# default-centos-8-3003-3-py3: {extends: '.test_instance'} +default-centos-7-3003-3-py3: {extends: '.test_instance'} default-fedora-34-3003-3-py3: {extends: '.test_instance'} default-fedora-33-3003-3-py3: {extends: '.test_instance'} default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'} -default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'} -default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'} -default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'} +default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'} +# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'} +default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'} # default-arch-base-latest-3003-3-py3: {extends: '.test_instance'} default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'} default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'} -default-almalinux-8-3003-3-py3: {extends: '.test_instance'} -# default-debian-11-3002-7-py3: {extends: '.test_instance_failure_permitted'} -default-debian-10-3002-7-py3: {extends: '.test_instance'} -# default-debian-9-3002-7-py3: {extends: '.test_instance'} +# default-almalinux-8-3003-3-py3: {extends: '.test_instance'} +# default-debian-11-3002-7-py3: {extends: '.test_instance'} +# default-debian-10-3002-7-py3: {extends: '.test_instance'} +default-debian-9-3002-7-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} -default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} # default-centos-8-3002-7-py3: {extends: '.test_instance'} -default-centos-7-3002-7-py3: {extends: '.test_instance'} +# default-centos-7-3002-7-py3: {extends: '.test_instance'} # default-fedora-34-3002-7-py3: {extends: '.test_instance'} # default-fedora-33-3002-7-py3: {extends: '.test_instance'} # default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'} # default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'} # default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'} -default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'} # default-arch-base-latest-3002-7-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'} # default-debian-10-3001-8-py3: {extends: '.test_instance'} -default-debian-9-3001-8-py3: {extends: '.test_instance'} +# default-debian-9-3001-8-py3: {extends: '.test_instance'} # default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'} # default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'} # default-centos-8-3001-8-py3: {extends: '.test_instance'} @@ -209,7 +233,7 @@ default-debian-9-3001-8-py3: {extends: '.test_instance'} # default-fedora-33-3001-8-py3: {extends: '.test_instance'} # default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'} # default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'} # default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'} # default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index 44ade7d..4a5e683 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,7 @@ jobs: # - env: INSTANCE=default-debian-9-tiamat-py3 # - env: INSTANCE=default-ubuntu-2004-tiamat-py3 # - env: INSTANCE=default-ubuntu-1804-tiamat-py3 + # - env: INSTANCE=default-centos-stream8-tiamat-py3 # - env: INSTANCE=default-centos-8-tiamat-py3 # - env: INSTANCE=default-centos-7-tiamat-py3 # - env: INSTANCE=default-amazonlinux-2-tiamat-py3 @@ -100,6 +101,7 @@ jobs: # - env: INSTANCE=default-debian-9-master-py3 # - env: INSTANCE=default-ubuntu-2004-master-py3 # - env: INSTANCE=default-ubuntu-1804-master-py3 + # - env: INSTANCE=default-centos-stream8-master-py3 # - env: INSTANCE=default-centos-8-master-py3 # - env: INSTANCE=default-centos-7-master-py3 # - env: INSTANCE=default-fedora-34-master-py3 @@ -115,32 +117,54 @@ jobs: # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 # - env: INSTANCE=default-almalinux-8-master-py3 # - env: INSTANCE=default-rockylinux-8-master-py3 - - env: INSTANCE=default-debian-11-3003-3-py3 - # - env: INSTANCE=default-debian-10-3003-3-py3 + - env: INSTANCE=default-debian-11-3004-0-py3 + # - env: INSTANCE=default-debian-10-3004-0-py3 + # - env: INSTANCE=default-debian-9-3004-0-py3 + - env: INSTANCE=default-ubuntu-2004-3004-0-py3 + # - env: INSTANCE=default-ubuntu-1804-3004-0-py3 + - env: INSTANCE=default-centos-stream8-3004-0-py3 + - env: INSTANCE=default-centos-8-3004-0-py3 + # - env: INSTANCE=default-centos-7-3004-0-py3 + # - env: INSTANCE=default-fedora-34-3004-0-py3 + # - env: INSTANCE=default-fedora-33-3004-0-py3 + # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3 + # - env: INSTANCE=default-opensuse-leap-152-3004-0-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3 + - env: INSTANCE=default-amazonlinux-2-3004-0-py3 + - env: INSTANCE=default-oraclelinux-8-3004-0-py3 + # - env: INSTANCE=default-oraclelinux-7-3004-0-py3 + - env: INSTANCE=default-arch-base-latest-3004-0-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3 + - env: INSTANCE=default-almalinux-8-3004-0-py3 + - env: INSTANCE=default-rockylinux-8-3004-0-py3 + # - env: INSTANCE=default-debian-11-3003-3-py3 + - env: INSTANCE=default-debian-10-3003-3-py3 # - env: INSTANCE=default-debian-9-3003-3-py3 - - env: INSTANCE=default-ubuntu-2004-3003-3-py3 - # - env: INSTANCE=default-ubuntu-1804-3003-3-py3 - - env: INSTANCE=default-centos-8-3003-3-py3 - # - env: INSTANCE=default-centos-7-3003-3-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-3-py3 + - env: INSTANCE=default-ubuntu-1804-3003-3-py3 + # - env: INSTANCE=default-centos-stream8-3003-3-py3 + # - env: INSTANCE=default-centos-8-3003-3-py3 + - env: INSTANCE=default-centos-7-3003-3-py3 - env: INSTANCE=default-fedora-34-3003-3-py3 - env: INSTANCE=default-fedora-33-3003-3-py3 - env: INSTANCE=default-opensuse-leap-153-3003-3-py3 # - env: INSTANCE=default-opensuse-leap-152-3003-3-py3 - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3 - - env: INSTANCE=default-amazonlinux-2-3003-3-py3 - - env: INSTANCE=default-oraclelinux-8-3003-3-py3 - # - env: INSTANCE=default-oraclelinux-7-3003-3-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-3-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-3-py3 + - env: INSTANCE=default-oraclelinux-7-3003-3-py3 # - env: INSTANCE=default-arch-base-latest-3003-3-py3 - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3 - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3 - - env: INSTANCE=default-almalinux-8-3003-3-py3 + # - env: INSTANCE=default-almalinux-8-3003-3-py3 # - env: INSTANCE=default-debian-11-3002-7-py3 - - env: INSTANCE=default-debian-10-3002-7-py3 - # - env: INSTANCE=default-debian-9-3002-7-py3 + # - env: INSTANCE=default-debian-10-3002-7-py3 + - env: INSTANCE=default-debian-9-3002-7-py3 # - env: INSTANCE=default-ubuntu-2004-3002-7-py3 - - env: INSTANCE=default-ubuntu-1804-3002-7-py3 + # - env: INSTANCE=default-ubuntu-1804-3002-7-py3 # - env: INSTANCE=default-centos-8-3002-7-py3 - - env: INSTANCE=default-centos-7-3002-7-py3 + # - env: INSTANCE=default-centos-7-3002-7-py3 # - env: INSTANCE=default-fedora-34-3002-7-py3 # - env: INSTANCE=default-fedora-33-3002-7-py3 # - env: INSTANCE=default-opensuse-leap-153-3002-7-py3 @@ -148,12 +172,12 @@ jobs: # - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3 # - env: INSTANCE=default-amazonlinux-2-3002-7-py3 # - env: INSTANCE=default-oraclelinux-8-3002-7-py3 - - env: INSTANCE=default-oraclelinux-7-3002-7-py3 + # - env: INSTANCE=default-oraclelinux-7-3002-7-py3 # - env: INSTANCE=default-arch-base-latest-3002-7-py3 # - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3 # - env: INSTANCE=default-debian-10-3001-8-py3 - - env: INSTANCE=default-debian-9-3001-8-py3 + # - env: INSTANCE=default-debian-9-3001-8-py3 # - env: INSTANCE=default-ubuntu-2004-3001-8-py3 # - env: INSTANCE=default-ubuntu-1804-3001-8-py3 # - env: INSTANCE=default-centos-8-3001-8-py3 diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index 849eda6..8737e78 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -53,15 +53,6 @@ platforms: verifier: inputs: saltmajorversion: 3002 - - name: openbsd-68-3001-1-py3 - driver: - box: myii/openbsd-6.8-3001.1-py3 - ssh: - shell: /bin/ksh - synced_folders: [] - verifier: - inputs: - saltmajorversion: 3001 - name: windows-10-latest-py3 driver: box: techneg/win10x64-pro-salt diff --git a/kitchen.yml b/kitchen.yml index 142355f..3d29b68 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -57,6 +57,12 @@ platforms: verifier: inputs: saltmajorversion: 3004 + - name: centos-stream8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:centos-stream8 + verifier: + inputs: + saltmajorversion: 3004 - name: centos-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-8 @@ -136,6 +142,12 @@ platforms: verifier: inputs: saltmajorversion: 3004 + - name: centos-stream8-master-py3 + driver: + image: saltimages/salt-master-py3:centos-stream8 + verifier: + inputs: + saltmajorversion: 3004 - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 @@ -240,6 +252,152 @@ platforms: inputs: saltmajorversion: 3004 + ## SALT `3004.0` + - name: debian-11-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-11 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: debian-10-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-10 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: debian-9-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-9 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: ubuntu-2004-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: ubuntu-1804-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: centos-stream8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-stream8 + verifier: + inputs: + saltmajorversion: 3004 + - name: centos-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-8 + verifier: + inputs: + saltmajorversion: 3004 + - name: centos-7-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-7 + verifier: + inputs: + saltmajorversion: 3004 + - name: fedora-34-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:fedora-34 + verifier: + inputs: + saltmajorversion: 3004 + - name: fedora-33-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:fedora-33 + verifier: + inputs: + saltmajorversion: 3004 + - name: opensuse-leap-153-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:opensuse-leap-15.3 + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3004 + - name: opensuse-leap-152-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:opensuse-leap-15.2 + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3004 + - name: opensuse-tmbl-latest-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3004 + - name: amazonlinux-2-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:amazonlinux-2 + verifier: + inputs: + saltmajorversion: 3004 + - name: oraclelinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:oraclelinux-8 + verifier: + inputs: + saltmajorversion: 3004 + - name: oraclelinux-7-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:oraclelinux-7 + verifier: + inputs: + saltmajorversion: 3004 + - name: arch-base-latest-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:arch-base-latest + verifier: + inputs: + saltmajorversion: 3004 + - name: gentoo-stage3-latest-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:gentoo-stage3-latest + run_command: /sbin/init + verifier: + inputs: + saltmajorversion: 3004 + - name: gentoo-stage3-systemd-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: almalinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:almalinux-8 + verifier: + inputs: + saltmajorversion: 3004 + - name: rockylinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:rockylinux-8 + verifier: + inputs: + saltmajorversion: 3004 + ## SALT `3003.3` - name: debian-11-3003-3-py3 driver: @@ -276,6 +434,12 @@ platforms: verifier: inputs: saltmajorversion: 3003 + - name: centos-stream8-3003-3-py3 + driver: + image: saltimages/salt-3003.3-py3:centos-stream8 + verifier: + inputs: + saltmajorversion: 3003 - name: centos-8-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:centos-8 diff --git a/test/salt/pillar/top.sls b/test/salt/pillar/top.sls index c41b9ab..0471b82 100644 --- a/test/salt/pillar/top.sls +++ b/test/salt/pillar/top.sls @@ -4,6 +4,8 @@ base: '*': - salt + 'G@saltversioninfo:0:3004 and G@pythonversion:0:3': + - v3004-py3 'G@saltversioninfo:0:3003 and G@pythonversion:0:3': - v3003-py3 'G@saltversioninfo:0:3002 and G@pythonversion:0:3':