From 592e3d1e4744e4d5b5ad88b1429f49bd62ed9f65 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 19 Feb 2021 07:42:37 +0000 Subject: [PATCH] ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/293 --- .gitlab-ci.yml | 95 +++++-- .travis.yml | 95 +++++-- kitchen.yml | 413 +++++++++++++++++++++------- test/integration/default/inspec.yml | 1 + 4 files changed, 452 insertions(+), 152 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da9cf54..d1f6ea5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,38 +123,81 @@ rubocop: ## 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` +# debian-debian-10-tiamat-py3: {extends: '.test_instance'} +# debian-debian-9-tiamat-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1604-tiamat-py3: {extends: '.test_instance'} +# redhat8-centos-8-tiamat-py3: {extends: '.test_instance'} +# centos-centos-7-tiamat-py3: {extends: '.test_instance'} +# amazon-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} +# redhat8-oraclelinux-8-tiamat-py3: {extends: '.test_instance'} +# centos-oraclelinux-7-tiamat-py3: {extends: '.test_instance'} debian-debian-10-master-py3: {extends: '.test_instance'} +debian-debian-9-master-py3: {extends: '.test_instance'} # ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'} ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1604-master-py3: {extends: '.test_instance'} redhat8-centos-8-master-py3: {extends: '.test_instance'} +centos-centos-7-master-py3: {extends: '.test_instance'} +# fedora-fedora-33-master-py3: {extends: '.test_instance'} fedora-fedora-32-master-py3: {extends: '.test_instance'} -# fedora-fedora-31-master-py3: {extends: '.test_instance'} -# suse-opensuse-leap-152-master-py3: {extends: '.test_instance'} -# amazon-amazonlinux-2-master-py3: {extends: '.test_instance'} +suse-opensuse-leap-152-master-py3: {extends: '.test_instance'} +suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} +amazon-amazonlinux-2-master-py3: {extends: '.test_instance'} redhat8-oraclelinux-8-master-py3: {extends: '.test_instance'} -# debian-debian-10-3000-3-py3: {extends: '.test_instance'} -# debian-debian-9-3000-3-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1804-3000-3-py3: {extends: '.test_instance'} -# redhat8-centos-8-3000-3-py3: {extends: '.test_instance'} -centos-centos-7-3000-3-py3: {extends: '.test_instance'} -# fedora-fedora-31-3000-3-py3: {extends: '.test_instance'} -suse-opensuse-leap-152-3000-3-py3: {extends: '.test_instance'} -amazon-amazonlinux-2-3000-3-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1804-3000-3-py2: {extends: '.test_instance'} -# ubuntu-ubuntu-1604-3000-3-py2: {extends: '.test_instance'} -# arch-arch-base-latest-3000-3-py2: {extends: '.test_instance'} -# debian-debian-10-2019-2-py3: {extends: '.test_instance'} -# debian-debian-9-2019-2-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1804-2019-2-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1604-2019-2-py3: {extends: '.test_instance'} -# centos-centos-8-2019-2-py3: {extends: '.test_instance'} -# centos-centos-7-2019-2-py3: {extends: '.test_instance'} -# fedora-fedora-31-2019-2-py3: {extends: '.test_instance'} -# suse-opensuse-leap-152-2019-2-py3: {extends: '.test_instance'} -# amazon-amazonlinux-2-2019-2-py3: {extends: '.test_instance'} -# centos-centos-6-2019-2-py2: {extends: '.test_instance'} -# amazon-amazonlinux-1-2019-2-py2: {extends: '.test_instance'} -arch-arch-base-latest-2019-2-py2: {extends: '.test_instance'} +centos-oraclelinux-7-master-py3: {extends: '.test_instance'} +gentoo-gentoo-stage3-latest-master-py3: {extends: '.test_instance'} +gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} +# debian-debian-10-3002-2-py3: {extends: '.test_instance'} +# debian-debian-9-3002-2-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-2004-3002-2-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1804-3002-2-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1604-3002-2-py3: {extends: '.test_instance'} +# redhat8-centos-8-3002-2-py3: {extends: '.test_instance'} +# centos-centos-7-3002-2-py3: {extends: '.test_instance'} +# fedora-fedora-33-3002-2-py3: {extends: '.test_instance'} +# fedora-fedora-32-3002-2-py3: {extends: '.test_instance'} +# suse-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} +# suse-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} +# amazon-amazonlinux-2-3002-2-py3: {extends: '.test_instance'} +# redhat8-oraclelinux-8-3002-2-py3: {extends: '.test_instance'} +# centos-oraclelinux-7-3002-2-py3: {extends: '.test_instance'} +arch-arch-base-latest-3002-2-py3: {extends: '.test_instance'} +# gentoo-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'} +# gentoo-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'} +# debian-debian-10-3001-4-py3: {extends: '.test_instance'} +# debian-debian-9-3001-4-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-2004-3001-4-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1804-3001-4-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1604-3001-4-py3: {extends: '.test_instance'} +# redhat8-centos-8-3001-4-py3: {extends: '.test_instance'} +# centos-centos-7-3001-4-py3: {extends: '.test_instance'} +# fedora-fedora-33-3001-4-py3: {extends: '.test_instance'} +# fedora-fedora-32-3001-4-py3: {extends: '.test_instance'} +# suse-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'} +# suse-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'} +# amazon-amazonlinux-2-3001-4-py3: {extends: '.test_instance'} +# redhat8-oraclelinux-8-3001-4-py3: {extends: '.test_instance'} +# centos-oraclelinux-7-3001-4-py3: {extends: '.test_instance'} +# arch-arch-base-latest-3001-4-py3: {extends: '.test_instance'} +# gentoo-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'} +# gentoo-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'} +# debian-debian-10-3000-6-py3: {extends: '.test_instance'} +# debian-debian-9-3000-6-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1804-3000-6-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1604-3000-6-py3: {extends: '.test_instance'} +# redhat8-centos-8-3000-6-py3: {extends: '.test_instance'} +# centos-centos-7-3000-6-py3: {extends: '.test_instance'} +# suse-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'} +# amazon-amazonlinux-2-3000-6-py3: {extends: '.test_instance'} +# redhat8-oraclelinux-8-3000-6-py3: {extends: '.test_instance'} +# centos-oraclelinux-7-3000-6-py3: {extends: '.test_instance'} +# gentoo-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'} +# gentoo-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1804-3000-6-py2: {extends: '.test_instance'} +# ubuntu-ubuntu-1604-3000-6-py2: {extends: '.test_instance'} +# arch-arch-base-latest-3000-6-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index cc2c3b3..5694afa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,38 +83,81 @@ 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=debian-debian-10-tiamat-py3 + # - env: INSTANCE=debian-debian-9-tiamat-py3 + # - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3 + # - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3 + # - env: INSTANCE=ubuntu-ubuntu-1604-tiamat-py3 + # - env: INSTANCE=redhat8-centos-8-tiamat-py3 + # - env: INSTANCE=centos-centos-7-tiamat-py3 + # - env: INSTANCE=amazon-amazonlinux-2-tiamat-py3 + # - env: INSTANCE=redhat8-oraclelinux-8-tiamat-py3 + # - env: INSTANCE=centos-oraclelinux-7-tiamat-py3 - env: INSTANCE=debian-debian-10-master-py3 + - env: INSTANCE=debian-debian-9-master-py3 # - env: INSTANCE=ubuntu-ubuntu-2004-master-py3 - env: INSTANCE=ubuntu-ubuntu-1804-master-py3 + # - env: INSTANCE=ubuntu-ubuntu-1604-master-py3 - env: INSTANCE=redhat8-centos-8-master-py3 + - env: INSTANCE=centos-centos-7-master-py3 + # - env: INSTANCE=fedora-fedora-33-master-py3 - env: INSTANCE=fedora-fedora-32-master-py3 - # - env: INSTANCE=fedora-fedora-31-master-py3 - # - env: INSTANCE=suse-opensuse-leap-152-master-py3 - # - env: INSTANCE=amazon-amazonlinux-2-master-py3 + - env: INSTANCE=suse-opensuse-leap-152-master-py3 + - env: INSTANCE=suse-opensuse-tmbl-latest-master-py3 + - env: INSTANCE=amazon-amazonlinux-2-master-py3 - env: INSTANCE=redhat8-oraclelinux-8-master-py3 - # - env: INSTANCE=debian-debian-10-3000-3-py3 - # - env: INSTANCE=debian-debian-9-3000-3-py3 - # - env: INSTANCE=ubuntu-ubuntu-1804-3000-3-py3 - # - env: INSTANCE=redhat8-centos-8-3000-3-py3 - - env: INSTANCE=centos-centos-7-3000-3-py3 - # - env: INSTANCE=fedora-fedora-31-3000-3-py3 - - env: INSTANCE=suse-opensuse-leap-152-3000-3-py3 - - env: INSTANCE=amazon-amazonlinux-2-3000-3-py3 - # - env: INSTANCE=ubuntu-ubuntu-1804-3000-3-py2 - # - env: INSTANCE=ubuntu-ubuntu-1604-3000-3-py2 - # - env: INSTANCE=arch-arch-base-latest-3000-3-py2 - # - env: INSTANCE=debian-debian-10-2019-2-py3 - # - env: INSTANCE=debian-debian-9-2019-2-py3 - # - env: INSTANCE=ubuntu-ubuntu-1804-2019-2-py3 - # - env: INSTANCE=ubuntu-ubuntu-1604-2019-2-py3 - # - env: INSTANCE=centos-centos-8-2019-2-py3 - # - env: INSTANCE=centos-centos-7-2019-2-py3 - # - env: INSTANCE=fedora-fedora-31-2019-2-py3 - # - env: INSTANCE=suse-opensuse-leap-152-2019-2-py3 - # - env: INSTANCE=amazon-amazonlinux-2-2019-2-py3 - # - env: INSTANCE=centos-centos-6-2019-2-py2 - # - env: INSTANCE=amazon-amazonlinux-1-2019-2-py2 - - env: INSTANCE=arch-arch-base-latest-2019-2-py2 + - env: INSTANCE=centos-oraclelinux-7-master-py3 + - env: INSTANCE=gentoo-gentoo-stage3-latest-master-py3 + - env: INSTANCE=gentoo-gentoo-stage3-systemd-master-py3 + # - env: INSTANCE=debian-debian-10-3002-2-py3 + # - env: INSTANCE=debian-debian-9-3002-2-py3 + # - env: INSTANCE=ubuntu-ubuntu-2004-3002-2-py3 + # - env: INSTANCE=ubuntu-ubuntu-1804-3002-2-py3 + # - env: INSTANCE=ubuntu-ubuntu-1604-3002-2-py3 + # - env: INSTANCE=redhat8-centos-8-3002-2-py3 + # - env: INSTANCE=centos-centos-7-3002-2-py3 + # - env: INSTANCE=fedora-fedora-33-3002-2-py3 + # - env: INSTANCE=fedora-fedora-32-3002-2-py3 + # - env: INSTANCE=suse-opensuse-leap-152-3002-2-py3 + # - env: INSTANCE=suse-opensuse-tmbl-latest-3002-2-py3 + # - env: INSTANCE=amazon-amazonlinux-2-3002-2-py3 + # - env: INSTANCE=redhat8-oraclelinux-8-3002-2-py3 + # - env: INSTANCE=centos-oraclelinux-7-3002-2-py3 + - env: INSTANCE=arch-arch-base-latest-3002-2-py3 + # - env: INSTANCE=gentoo-gentoo-stage3-latest-3002-2-py3 + # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3002-2-py3 + # - env: INSTANCE=debian-debian-10-3001-4-py3 + # - env: INSTANCE=debian-debian-9-3001-4-py3 + # - env: INSTANCE=ubuntu-ubuntu-2004-3001-4-py3 + # - env: INSTANCE=ubuntu-ubuntu-1804-3001-4-py3 + # - env: INSTANCE=ubuntu-ubuntu-1604-3001-4-py3 + # - env: INSTANCE=redhat8-centos-8-3001-4-py3 + # - env: INSTANCE=centos-centos-7-3001-4-py3 + # - env: INSTANCE=fedora-fedora-33-3001-4-py3 + # - env: INSTANCE=fedora-fedora-32-3001-4-py3 + # - env: INSTANCE=suse-opensuse-leap-152-3001-4-py3 + # - env: INSTANCE=suse-opensuse-tmbl-latest-3001-4-py3 + # - env: INSTANCE=amazon-amazonlinux-2-3001-4-py3 + # - env: INSTANCE=redhat8-oraclelinux-8-3001-4-py3 + # - env: INSTANCE=centos-oraclelinux-7-3001-4-py3 + # - env: INSTANCE=arch-arch-base-latest-3001-4-py3 + # - env: INSTANCE=gentoo-gentoo-stage3-latest-3001-4-py3 + # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3001-4-py3 + # - env: INSTANCE=debian-debian-10-3000-6-py3 + # - env: INSTANCE=debian-debian-9-3000-6-py3 + # - env: INSTANCE=ubuntu-ubuntu-1804-3000-6-py3 + # - env: INSTANCE=ubuntu-ubuntu-1604-3000-6-py3 + # - env: INSTANCE=redhat8-centos-8-3000-6-py3 + # - env: INSTANCE=centos-centos-7-3000-6-py3 + # - env: INSTANCE=suse-opensuse-leap-152-3000-6-py3 + # - env: INSTANCE=amazon-amazonlinux-2-3000-6-py3 + # - env: INSTANCE=redhat8-oraclelinux-8-3000-6-py3 + # - env: INSTANCE=centos-oraclelinux-7-3000-6-py3 + # - env: INSTANCE=gentoo-gentoo-stage3-latest-3000-6-py3 + # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3000-6-py3 + # - env: INSTANCE=ubuntu-ubuntu-1804-3000-6-py2 + # - env: INSTANCE=ubuntu-ubuntu-1604-3000-6-py2 + # - env: INSTANCE=arch-arch-base-latest-3000-6-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index e8f0187..df0a241 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -8,14 +8,60 @@ driver: privileged: true run_command: /lib/systemd/systemd -# Make sure the platforms listed below match up with -# the `env.matrix` instances defined in `.travis.yml` platforms: + ## SALT `tiamat` + - name: debian-10-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:debian-10 + provision_command: + - apt-get update + - apt-get install --reinstall -y udev + - apt-get install -y snapd + - name: debian-9-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:debian-9 + provision_command: + - apt-get update + - apt-get install --reinstall -y udev + - apt-get install -y snapd + - name: ubuntu-2004-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-20.04 + - name: ubuntu-1804-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-18.04 + - name: ubuntu-1604-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-16.04 + - name: centos-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:centos-8 + - name: centos-7-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:centos-7 + - name: amazonlinux-2-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:amazonlinux-2 + - name: oraclelinux-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:oraclelinux-8 + - name: oraclelinux-7-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:oraclelinux-7 + ## SALT `master` - name: debian-10-master-py3 driver: image: saltimages/salt-master-py3:debian-10 provision_command: + - apt-get update + - apt-get install --reinstall -y udev + - apt-get install -y snapd + - name: debian-9-master-py3 + driver: + image: saltimages/salt-master-py3:debian-9 + provision_command: + - apt-get update - apt-get install --reinstall -y udev - apt-get install -y snapd - name: ubuntu-2004-master-py3 @@ -24,15 +70,21 @@ platforms: - name: ubuntu-1804-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-18.04 + - name: ubuntu-1604-master-py3 + driver: + image: saltimages/salt-master-py3:ubuntu-16.04 - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 + - name: centos-7-master-py3 + driver: + image: saltimages/salt-master-py3:centos-7 + - name: fedora-33-master-py3 + driver: + image: saltimages/salt-master-py3:fedora-33 - name: fedora-32-master-py3 driver: image: saltimages/salt-master-py3:fedora-32 - - name: fedora-31-master-py3 - driver: - image: saltimages/salt-master-py3:fedora-31 - name: opensuse-leap-152-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.2 @@ -41,12 +93,23 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + - name: opensuse-tmbl-latest-master-py3 + driver: + image: saltimages/salt-master-py3:opensuse-tumbleweed-latest + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: amazonlinux-2-master-py3 driver: image: saltimages/salt-master-py3:amazonlinux-2 - name: oraclelinux-8-master-py3 driver: image: saltimages/salt-master-py3:oraclelinux-8 + - name: oraclelinux-7-master-py3 + driver: + image: saltimages/salt-master-py3:oraclelinux-7 - name: gentoo-stage3-latest-master-py3 driver: image: saltimages/salt-master-py3:gentoo-stage3-latest @@ -55,103 +118,212 @@ platforms: driver: image: saltimages/salt-master-py3:gentoo-stage3-systemd - ## SALT `3000.3` - - name: debian-10-3000-3-py3 + ## SALT `3002.2` + - name: debian-10-3002-2-py3 driver: - image: saltimages/salt-3000.3-py3:debian-10 + image: saltimages/salt-3002.2-py3:debian-10 provision_command: + - apt-get update - apt-get install --reinstall -y udev - apt-get install -y snapd - - name: debian-9-3000-3-py3 + - name: debian-9-3002-2-py3 driver: - image: saltimages/salt-3000.3-py3:debian-9 + image: saltimages/salt-3002.2-py3:debian-9 provision_command: + - apt-get update - apt-get install --reinstall -y udev - apt-get install -y snapd - - name: ubuntu-1804-3000-3-py3 + - name: ubuntu-2004-3002-2-py3 driver: - image: saltimages/salt-3000.3-py3:ubuntu-18.04 - - name: centos-8-3000-3-py3 + image: saltimages/salt-3002.2-py3:ubuntu-20.04 + - name: ubuntu-1804-3002-2-py3 driver: - image: saltimages/salt-3000.3-py3:centos-8 - - name: centos-7-3000-3-py3 + image: saltimages/salt-3002.2-py3:ubuntu-18.04 + - name: ubuntu-1604-3002-2-py3 driver: - image: saltimages/salt-3000.3-py3:centos-7 - - name: fedora-31-3000-3-py3 + image: saltimages/salt-3002.2-py3:ubuntu-16.04 + - name: centos-8-3002-2-py3 driver: - image: saltimages/salt-3000.3-py3:fedora-31 - - name: opensuse-leap-152-3000-3-py3 + image: saltimages/salt-3002.2-py3:centos-8 + - name: centos-7-3002-2-py3 driver: - image: saltimages/salt-3000.3-py3:opensuse-leap-15.2 + image: saltimages/salt-3002.2-py3:centos-7 + - name: fedora-33-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:fedora-33 + - name: fedora-32-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:fedora-32 + - name: opensuse-leap-152-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3000-3-py3 + - name: opensuse-tmbl-latest-3002-2-py3 driver: - image: saltimages/salt-3000.3-py3:amazonlinux-2 - - name: ubuntu-1804-3000-3-py2 - driver: - image: saltimages/salt-3000.3-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-3-py2 - driver: - image: saltimages/salt-3000.3-py2:ubuntu-16.04 - - name: arch-base-latest-3000-3-py2 - driver: - image: saltimages/salt-3000.3-py2:arch-base-latest + image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: amazonlinux-2-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:amazonlinux-2 + - name: oraclelinux-8-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:oraclelinux-8 + - name: oraclelinux-7-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:oraclelinux-7 + - name: arch-base-latest-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:arch-base-latest + run_command: /usr/lib/systemd/systemd + - name: gentoo-stage3-latest-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:gentoo-stage3-systemd - ## SALT `2019.2` - - name: debian-10-2019-2-py3 + ## SALT `3001.4` + - name: debian-10-3001-4-py3 driver: - image: saltimages/salt-2019.2-py3:debian-10 + image: saltimages/salt-3001.4-py3:debian-10 provision_command: + - apt-get update - apt-get install --reinstall -y udev - apt-get install -y snapd - - name: debian-9-2019-2-py3 + - name: debian-9-3001-4-py3 driver: - image: saltimages/salt-2019.2-py3:debian-9 + image: saltimages/salt-3001.4-py3:debian-9 provision_command: + - apt-get update - apt-get install --reinstall -y udev - apt-get install -y snapd - - name: ubuntu-1804-2019-2-py3 + - name: ubuntu-2004-3001-4-py3 driver: - image: saltimages/salt-2019.2-py3:ubuntu-18.04 - - name: ubuntu-1604-2019-2-py3 + image: saltimages/salt-3001.4-py3:ubuntu-20.04 + - name: ubuntu-1804-3001-4-py3 driver: - image: saltimages/salt-2019.2-py3:ubuntu-16.04 - - name: centos-8-2019-2-py3 + image: saltimages/salt-3001.4-py3:ubuntu-18.04 + - name: ubuntu-1604-3001-4-py3 driver: - image: saltimages/salt-2019.2-py3:centos-8 - - name: centos-7-2019-2-py3 + image: saltimages/salt-3001.4-py3:ubuntu-16.04 + - name: centos-8-3001-4-py3 driver: - image: saltimages/salt-2019.2-py3:centos-7 - - name: fedora-31-2019-2-py3 + image: saltimages/salt-3001.4-py3:centos-8 + - name: centos-7-3001-4-py3 driver: - image: saltimages/salt-2019.2-py3:fedora-31 - - name: opensuse-leap-152-2019-2-py3 + image: saltimages/salt-3001.4-py3:centos-7 + - name: fedora-33-3001-4-py3 driver: - image: saltimages/salt-2019.2-py3:opensuse-leap-15.2 + image: saltimages/salt-3001.4-py3:fedora-33 + - name: fedora-32-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:fedora-32 + - name: opensuse-leap-152-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-2019-2-py3 + - name: opensuse-tmbl-latest-3001-4-py3 driver: - image: saltimages/salt-2019.2-py3:amazonlinux-2 - - name: centos-6-2019-2-py2 + image: saltimages/salt-3001.4-py3:opensuse-tumbleweed-latest + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: amazonlinux-2-3001-4-py3 driver: - image: saltimages/salt-2019.2-py2:centos-6 + image: saltimages/salt-3001.4-py3:amazonlinux-2 + - name: oraclelinux-8-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:oraclelinux-8 + - name: oraclelinux-7-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:oraclelinux-7 + - name: arch-base-latest-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:arch-base-latest + run_command: /usr/lib/systemd/systemd + - name: gentoo-stage3-latest-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:gentoo-stage3-latest run_command: /sbin/init - - name: amazonlinux-1-2019-2-py2 + - name: gentoo-stage3-systemd-3001-4-py3 driver: - image: saltimages/salt-2019.2-py2:amazonlinux-1 + image: saltimages/salt-3001.4-py3:gentoo-stage3-systemd + + ## SALT `3000.6` + - name: debian-10-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:debian-10 + provision_command: + - apt-get update + - apt-get install --reinstall -y udev + - apt-get install -y snapd + - name: debian-9-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:debian-9 + provision_command: + - apt-get update + - apt-get install --reinstall -y udev + - apt-get install -y snapd + - name: ubuntu-1804-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:ubuntu-18.04 + - name: ubuntu-1604-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:ubuntu-16.04 + - name: centos-8-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:centos-8 + - name: centos-7-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:centos-7 + - name: opensuse-leap-152-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:opensuse-leap-15.2 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: amazonlinux-2-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:amazonlinux-2 + - name: oraclelinux-8-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:oraclelinux-8 + - name: oraclelinux-7-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:oraclelinux-7 + - name: gentoo-stage3-latest-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:gentoo-stage3-latest run_command: /sbin/init - - name: arch-base-latest-2019-2-py2 + - name: gentoo-stage3-systemd-3000-6-py3 driver: - image: saltimages/salt-2019.2-py2:arch-base-latest + image: saltimages/salt-3000.6-py3:gentoo-stage3-systemd + - name: ubuntu-1804-3000-6-py2 + driver: + image: saltimages/salt-3000.6-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-6-py2 + driver: + image: saltimages/salt-3000.6-py2:ubuntu-16.04 + - name: arch-base-latest-3000-6-py2 + driver: + image: saltimages/salt-3000.6-py2:arch-base-latest run_command: /usr/lib/systemd/systemd provisioner: @@ -175,12 +347,21 @@ verifier: suites: - name: debian includes: + - debian-10-tiamat-py3 + - debian-9-tiamat-py3 - debian-10-master-py3 - - debian-10-3000-3-py3 - - debian-9-3000-3-py3 - - debian-10-2019-2-py3 - - debian-9-2019-2-py3 + - debian-9-master-py3 + - debian-10-3002-2-py3 + - debian-9-3002-2-py3 + - debian-10-3001-4-py3 + - debian-9-3001-4-py3 + - debian-10-3000-6-py3 + - debian-9-3000-6-py3 provisioner: + dependencies: + - name: node + repo: git + source: https://github.com/saltstack-formulas/node-formula.git state_top: base: '*': @@ -193,23 +374,32 @@ suites: - packages pillars_from_files: packages.sls: test/salt/pillar/debian.sls - dependencies: - - name: node - repo: git - source: https://github.com/saltstack-formulas/node-formula.git verifier: inspec_tests: - path: test/integration/default - name: ubuntu includes: + - ubuntu-2004-tiamat-py3 + - ubuntu-1804-tiamat-py3 + - ubuntu-1604-tiamat-py3 - ubuntu-2004-master-py3 - ubuntu-1804-master-py3 - - ubuntu-1804-3000-3-py3 - - ubuntu-1804-3000-3-py2 - - ubuntu-1604-3000-3-py2 - - ubuntu-1804-2019-2-py3 - - ubuntu-1604-2019-2-py3 + - ubuntu-1604-master-py3 + - ubuntu-2004-3002-2-py3 + - ubuntu-1804-3002-2-py3 + - ubuntu-1604-3002-2-py3 + - ubuntu-2004-3001-4-py3 + - ubuntu-1804-3001-4-py3 + - ubuntu-1604-3001-4-py3 + - ubuntu-1804-3000-6-py3 + - ubuntu-1604-3000-6-py3 + - ubuntu-1804-3000-6-py2 + - ubuntu-1604-3000-6-py2 provisioner: + dependencies: + - name: golang + repo: git + source: https://github.com/saltstack-formulas/golang-formula.git state_top: base: '*': @@ -222,19 +412,17 @@ suites: - packages pillars_from_files: packages.sls: test/salt/pillar/ubuntu.sls - dependencies: - - name: golang - repo: git - source: https://github.com/saltstack-formulas/golang-formula.git verifier: inspec_tests: - path: test/integration/default - name: fedora includes: + - fedora-33-master-py3 - fedora-32-master-py3 - - fedora-31-master-py3 - - fedora-31-3000-3-py3 - - fedora-31-2019-2-py3 + - fedora-33-3002-2-py3 + - fedora-32-3002-2-py3 + - fedora-33-3001-4-py3 + - fedora-32-3001-4-py3 provisioner: state_top: base: @@ -252,10 +440,21 @@ suites: - path: test/integration/default - name: redhat8 includes: + - centos-8-tiamat-py3 + - oraclelinux-8-tiamat-py3 - centos-8-master-py3 - oraclelinux-8-master-py3 - - centos-8-3000-3-py3 + - centos-8-3002-2-py3 + - oraclelinux-8-3002-2-py3 + - centos-8-3001-4-py3 + - oraclelinux-8-3001-4-py3 + - centos-8-3000-6-py3 + - oraclelinux-8-3000-6-py3 provisioner: + dependencies: + - name: epel + repo: git + source: https://github.com/saltstack-formulas/epel-formula.git state_top: base: '*': @@ -268,20 +467,26 @@ suites: - packages pillars_from_files: packages.sls: test/salt/pillar/redhat8.sls - dependencies: - - name: epel - repo: git - source: https://github.com/saltstack-formulas/epel-formula.git verifier: inspec_tests: - path: test/integration/default - name: centos includes: - - centos-7-3000-3-py3 - - centos-8-2019-2-py3 - - centos-7-2019-2-py3 - - centos-6-2019-2-py2 + - centos-7-tiamat-py3 + - oraclelinux-7-tiamat-py3 + - centos-7-master-py3 + - oraclelinux-7-master-py3 + - centos-7-3002-2-py3 + - oraclelinux-7-3002-2-py3 + - centos-7-3001-4-py3 + - oraclelinux-7-3001-4-py3 + - centos-7-3000-6-py3 + - oraclelinux-7-3000-6-py3 provisioner: + dependencies: + - name: epel + repo: git + source: https://github.com/saltstack-formulas/epel-formula.git state_top: base: '*': @@ -294,20 +499,21 @@ suites: - packages pillars_from_files: packages.sls: test/salt/pillar/redhat.sls - dependencies: - - name: epel - repo: git - source: https://github.com/saltstack-formulas/epel-formula.git verifier: inspec_tests: - path: test/integration/default - name: amazon includes: + - amazonlinux-2-tiamat-py3 - amazonlinux-2-master-py3 - - amazonlinux-2-3000-3-py3 - - amazonlinux-2-2019-2-py3 - - amazonlinux-1-2019-2-py2 + - amazonlinux-2-3002-2-py3 + - amazonlinux-2-3001-4-py3 + - amazonlinux-2-3000-6-py3 provisioner: + dependencies: + - name: epel + repo: git + source: https://github.com/saltstack-formulas/epel-formula.git state_top: base: '*': @@ -320,18 +526,18 @@ suites: - packages pillars_from_files: packages.sls: test/salt/pillar/amazon.sls - dependencies: - - name: epel - repo: git - source: https://github.com/saltstack-formulas/epel-formula.git verifier: inspec_tests: - path: test/integration/default - name: suse includes: - opensuse-leap-152-master-py3 - - opensuse-leap-152-3000-3-py3 - - opensuse-leap-152-2019-2-py3 + - opensuse-tmbl-latest-master-py3 + - opensuse-leap-152-3002-2-py3 + - opensuse-tmbl-latest-3002-2-py3 + - opensuse-leap-152-3001-4-py3 + - opensuse-tmbl-latest-3001-4-py3 + - opensuse-leap-152-3000-6-py3 provisioner: state_top: base: @@ -349,8 +555,9 @@ suites: - path: test/integration/default - name: arch includes: - - arch-base-latest-3000-3-py2 - - arch-base-latest-2019-2-py2 + - arch-base-latest-3002-2-py3 + - arch-base-latest-3001-4-py3 + - arch-base-latest-3000-6-py2 provisioner: state_top: base: @@ -370,6 +577,12 @@ suites: includes: - gentoo-stage3-latest-master-py3 - gentoo-stage3-systemd-master-py3 + - gentoo-stage3-latest-3002-2-py3 + - gentoo-stage3-systemd-3002-2-py3 + - gentoo-stage3-latest-3001-4-py3 + - gentoo-stage3-systemd-3001-4-py3 + - gentoo-stage3-latest-3000-6-py3 + - gentoo-stage3-systemd-3000-6-py3 provisioner: state_top: base: diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index 184c0dd..311c17b 100644 --- a/test/integration/default/inspec.yml +++ b/test/integration/default/inspec.yml @@ -21,3 +21,4 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform: windows