diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61bb4738433b457a30e7bfb5eec726eff85e71b0..d66672e017d07f46a16fa2ebafa9a17e3859ad6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,36 +123,97 @@ 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`
+# default-debian-10-tiamat-py3: {extends: '.test_instance'}
+# 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-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
+# default-centos-8-tiamat-py3: {extends: '.test_instance'}
+# default-centos-7-tiamat-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
# default-debian-10-master-py3: {extends: '.test_instance'}
vimrc-debian-10-master-py3: {extends: '.test_instance'}
+# default-debian-9-master-py3: {extends: '.test_instance'}
+vimrc-debian-9-master-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-master-py3: {extends: '.test_instance'}
+vimrc-ubuntu-2004-master-py3: {extends: '.test_instance'}
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
+vimrc-ubuntu-1804-master-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-master-py3: {extends: '.test_instance'}
+vimrc-ubuntu-1604-master-py3: {extends: '.test_instance'}
# default-centos-8-master-py3: {extends: '.test_instance'}
-# default-fedora-31-master-py3: {extends: '.test_instance'}
-# default-opensuse-leap-151-master-py3: {extends: '.test_instance'}
+vimrc-centos-8-master-py3: {extends: '.test_instance'}
+# default-centos-7-master-py3: {extends: '.test_instance'}
+vimrc-centos-7-master-py3: {extends: '.test_instance'}
+# default-fedora-33-master-py3: {extends: '.test_instance'}
+vimrc-fedora-33-master-py3: {extends: '.test_instance'}
+# default-fedora-32-master-py3: {extends: '.test_instance'}
+vimrc-fedora-32-master-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+vimrc-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+vimrc-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
-# default-debian-10-2019-2-py3: {extends: '.test_instance'}
-# default-debian-9-2019-2-py3: {extends: '.test_instance'}
-default-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
-# default-centos-8-2019-2-py3: {extends: '.test_instance'}
-# default-fedora-31-2019-2-py3: {extends: '.test_instance'}
-default-opensuse-leap-151-2019-2-py3: {extends: '.test_instance'}
-# default-centos-7-2019-2-py2: {extends: '.test_instance'}
-default-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
-# default-arch-base-latest-2019-2-py2: {extends: '.test_instance'}
-default-fedora-30-2018-3-py3: {extends: '.test_instance'}
-# default-debian-9-2018-3-py2: {extends: '.test_instance'}
-# default-ubuntu-1604-2018-3-py2: {extends: '.test_instance'}
-# default-centos-7-2018-3-py2: {extends: '.test_instance'}
-# default-opensuse-leap-151-2018-3-py2: {extends: '.test_instance'}
-# default-amazonlinux-1-2018-3-py2: {extends: '.test_instance'}
-# default-arch-base-latest-2018-3-py2: {extends: '.test_instance'}
-# default-debian-8-2017-7-py2: {extends: '.test_instance'}
-# default-ubuntu-1604-2017-7-py2: {extends: '.test_instance'}
-# default-centos-6-2017-7-py2: {extends: '.test_instance'}
-# default-fedora-30-2017-7-py2: {extends: '.test_instance'}
-# default-opensuse-leap-151-2017-7-py2: {extends: '.test_instance'}
-# default-amazonlinux-1-2017-7-py2: {extends: '.test_instance'}
-# default-arch-base-latest-2017-7-py2: {extends: '.test_instance'}
+vimrc-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
+vimrc-oraclelinux-8-master-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
+vimrc-oraclelinux-7-master-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
+# vimrc-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
+# vimrc-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
+# default-debian-10-3002-2-py3: {extends: '.test_instance'}
+# default-debian-9-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
+# default-centos-8-3002-2-py3: {extends: '.test_instance'}
+# default-centos-7-3002-2-py3: {extends: '.test_instance'}
+# default-fedora-33-3002-2-py3: {extends: '.test_instance'}
+# default-fedora-32-3002-2-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3002-2-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
+# default-debian-10-3001-4-py3: {extends: '.test_instance'}
+# default-debian-9-3001-4-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
+# default-centos-8-3001-4-py3: {extends: '.test_instance'}
+# default-centos-7-3001-4-py3: {extends: '.test_instance'}
+# default-fedora-33-3001-4-py3: {extends: '.test_instance'}
+# default-fedora-32-3001-4-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3001-4-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
+# default-debian-10-3000-6-py3: {extends: '.test_instance'}
+# default-debian-9-3000-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
+# default-centos-8-3000-6-py3: {extends: '.test_instance'}
+# default-centos-7-3000-6-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
+# default-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
+# default-arch-base-latest-3000-6-py2: {extends: '.test_instance'}
###############################################################################
# `release` stage: `semantic-release`
diff --git a/.travis.yml b/.travis.yml
index ff86167dfbbf0b962b74aa23ba7d3b2fae1e3233..ab47270c2744a2dac3296556ad0fe7c09387bbb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,36 +83,97 @@ 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=default-debian-10-tiamat-py3
+ # - env: INSTANCE=default-debian-9-tiamat-py3
+ # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
+ # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
+ # - env: INSTANCE=default-ubuntu-1604-tiamat-py3
+ # - env: INSTANCE=default-centos-8-tiamat-py3
+ # - env: INSTANCE=default-centos-7-tiamat-py3
+ # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
+ # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
+ # - env: INSTANCE=default-oraclelinux-7-tiamat-py3
# - env: INSTANCE=default-debian-10-master-py3
- env: INSTANCE=vimrc-debian-10-master-py3
+ # - env: INSTANCE=default-debian-9-master-py3
+ - env: INSTANCE=vimrc-debian-9-master-py3
+ # - env: INSTANCE=default-ubuntu-2004-master-py3
+ - env: INSTANCE=vimrc-ubuntu-2004-master-py3
# - env: INSTANCE=default-ubuntu-1804-master-py3
+ - env: INSTANCE=vimrc-ubuntu-1804-master-py3
+ # - env: INSTANCE=default-ubuntu-1604-master-py3
+ - env: INSTANCE=vimrc-ubuntu-1604-master-py3
# - env: INSTANCE=default-centos-8-master-py3
- # - env: INSTANCE=default-fedora-31-master-py3
- # - env: INSTANCE=default-opensuse-leap-151-master-py3
+ - env: INSTANCE=vimrc-centos-8-master-py3
+ # - env: INSTANCE=default-centos-7-master-py3
+ - env: INSTANCE=vimrc-centos-7-master-py3
+ # - env: INSTANCE=default-fedora-33-master-py3
+ - env: INSTANCE=vimrc-fedora-33-master-py3
+ # - env: INSTANCE=default-fedora-32-master-py3
+ - env: INSTANCE=vimrc-fedora-32-master-py3
+ # - env: INSTANCE=default-opensuse-leap-152-master-py3
+ - env: INSTANCE=vimrc-opensuse-leap-152-master-py3
+ # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
+ - env: INSTANCE=vimrc-opensuse-tmbl-latest-master-py3
# - env: INSTANCE=default-amazonlinux-2-master-py3
- # - env: INSTANCE=default-debian-10-2019-2-py3
- # - env: INSTANCE=default-debian-9-2019-2-py3
- - env: INSTANCE=default-ubuntu-1804-2019-2-py3
- # - env: INSTANCE=default-centos-8-2019-2-py3
- # - env: INSTANCE=default-fedora-31-2019-2-py3
- - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
- # - env: INSTANCE=default-centos-7-2019-2-py2
- - env: INSTANCE=default-amazonlinux-2-2019-2-py3
- # - env: INSTANCE=default-arch-base-latest-2019-2-py2
- - env: INSTANCE=default-fedora-30-2018-3-py3
- # - env: INSTANCE=default-debian-9-2018-3-py2
- # - env: INSTANCE=default-ubuntu-1604-2018-3-py2
- # - env: INSTANCE=default-centos-7-2018-3-py2
- # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
- # - env: INSTANCE=default-amazonlinux-1-2018-3-py2
- # - env: INSTANCE=default-arch-base-latest-2018-3-py2
- # - env: INSTANCE=default-debian-8-2017-7-py2
- # - env: INSTANCE=default-ubuntu-1604-2017-7-py2
- # - env: INSTANCE=default-centos-6-2017-7-py2
- # - env: INSTANCE=default-fedora-30-2017-7-py2
- # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
- # - env: INSTANCE=default-amazonlinux-1-2017-7-py2
- # - env: INSTANCE=default-arch-base-latest-2017-7-py2
+ - env: INSTANCE=vimrc-amazonlinux-2-master-py3
+ # - env: INSTANCE=default-oraclelinux-8-master-py3
+ - env: INSTANCE=vimrc-oraclelinux-8-master-py3
+ # - env: INSTANCE=default-oraclelinux-7-master-py3
+ - env: INSTANCE=vimrc-oraclelinux-7-master-py3
+ # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
+ # - env: INSTANCE=vimrc-gentoo-stage3-latest-master-py3
+ # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
+ # - env: INSTANCE=vimrc-gentoo-stage3-systemd-master-py3
+ # - env: INSTANCE=default-debian-10-3002-2-py3
+ # - env: INSTANCE=default-debian-9-3002-2-py3
+ # - env: INSTANCE=default-ubuntu-2004-3002-2-py3
+ # - env: INSTANCE=default-ubuntu-1804-3002-2-py3
+ # - env: INSTANCE=default-ubuntu-1604-3002-2-py3
+ # - env: INSTANCE=default-centos-8-3002-2-py3
+ # - env: INSTANCE=default-centos-7-3002-2-py3
+ # - env: INSTANCE=default-fedora-33-3002-2-py3
+ # - env: INSTANCE=default-fedora-32-3002-2-py3
+ # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
+ # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
+ # - env: INSTANCE=default-amazonlinux-2-3002-2-py3
+ # - env: INSTANCE=default-oraclelinux-8-3002-2-py3
+ # - env: INSTANCE=default-oraclelinux-7-3002-2-py3
+ # - env: INSTANCE=default-arch-base-latest-3002-2-py3
+ # - env: INSTANCE=default-gentoo-stage3-latest-3002-2-py3
+ # - env: INSTANCE=default-gentoo-stage3-systemd-3002-2-py3
+ # - env: INSTANCE=default-debian-10-3001-4-py3
+ # - env: INSTANCE=default-debian-9-3001-4-py3
+ # - env: INSTANCE=default-ubuntu-2004-3001-4-py3
+ # - env: INSTANCE=default-ubuntu-1804-3001-4-py3
+ # - env: INSTANCE=default-ubuntu-1604-3001-4-py3
+ # - env: INSTANCE=default-centos-8-3001-4-py3
+ # - env: INSTANCE=default-centos-7-3001-4-py3
+ # - env: INSTANCE=default-fedora-33-3001-4-py3
+ # - env: INSTANCE=default-fedora-32-3001-4-py3
+ # - env: INSTANCE=default-opensuse-leap-152-3001-4-py3
+ # - env: INSTANCE=default-opensuse-tmbl-latest-3001-4-py3
+ # - env: INSTANCE=default-amazonlinux-2-3001-4-py3
+ # - env: INSTANCE=default-oraclelinux-8-3001-4-py3
+ # - env: INSTANCE=default-oraclelinux-7-3001-4-py3
+ # - env: INSTANCE=default-arch-base-latest-3001-4-py3
+ # - env: INSTANCE=default-gentoo-stage3-latest-3001-4-py3
+ # - env: INSTANCE=default-gentoo-stage3-systemd-3001-4-py3
+ # - env: INSTANCE=default-debian-10-3000-6-py3
+ # - env: INSTANCE=default-debian-9-3000-6-py3
+ # - env: INSTANCE=default-ubuntu-1804-3000-6-py3
+ # - env: INSTANCE=default-ubuntu-1604-3000-6-py3
+ # - env: INSTANCE=default-centos-8-3000-6-py3
+ # - env: INSTANCE=default-centos-7-3000-6-py3
+ # - env: INSTANCE=default-opensuse-leap-152-3000-6-py3
+ # - env: INSTANCE=default-amazonlinux-2-3000-6-py3
+ # - env: INSTANCE=default-oraclelinux-8-3000-6-py3
+ # - env: INSTANCE=default-oraclelinux-7-3000-6-py3
+ # - env: INSTANCE=default-gentoo-stage3-latest-3000-6-py3
+ # - env: INSTANCE=default-gentoo-stage3-systemd-3000-6-py3
+ # - env: INSTANCE=default-ubuntu-1804-3000-6-py2
+ # - env: INSTANCE=default-ubuntu-1604-3000-6-py2
+ # - env: INSTANCE=default-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 9475e43274ad3c2ec9b9edb452711cdc4712a682..067c6364bfc11a674f9ae86d2064d3dcb9bd7ab1 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -8,128 +8,282 @@ 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
+ - name: debian-9-tiamat-py3
+ driver:
+ image: saltimages/salt-tiamat-py3:debian-9
+ - 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
+ - name: debian-9-master-py3
+ driver:
+ image: saltimages/salt-master-py3:debian-9
+ - name: ubuntu-2004-master-py3
+ driver:
+ image: saltimages/salt-master-py3:ubuntu-20.04
- 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: fedora-31-master-py3
+ - name: centos-7-master-py3
driver:
- image: saltimages/salt-master-py3:fedora-31
- - name: opensuse-leap-151-master-py3
+ 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: opensuse-leap-152-master-py3
+ driver:
+ image: saltimages/salt-master-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: opensuse-tmbl-latest-master-py3
driver:
- image: netmanagers/salt-master-py3:opensuse-leap-15.1
+ image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
run_command: /usr/lib/systemd/systemd
- # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
+ # 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
+ run_command: /sbin/init
+ - name: gentoo-stage3-systemd-master-py3
+ driver:
+ image: saltimages/salt-master-py3:gentoo-stage3-systemd
- ## SALT `2019.2`
- - name: debian-10-2019-2-py3
+ ## SALT `3002.2`
+ - name: debian-10-3002-2-py3
+ driver:
+ image: saltimages/salt-3002.2-py3:debian-10
+ - name: debian-9-3002-2-py3
driver:
- image: saltimages/salt-2019.2-py3:debian-10
- - name: debian-9-2019-2-py3
+ image: saltimages/salt-3002.2-py3:debian-9
+ - name: ubuntu-2004-3002-2-py3
driver:
- image: saltimages/salt-2019.2-py3:debian-9
- - name: ubuntu-1804-2019-2-py3
+ image: saltimages/salt-3002.2-py3:ubuntu-20.04
+ - name: ubuntu-1804-3002-2-py3
driver:
- image: saltimages/salt-2019.2-py3:ubuntu-18.04
- - name: centos-8-2019-2-py3
+ image: saltimages/salt-3002.2-py3:ubuntu-18.04
+ - name: ubuntu-1604-3002-2-py3
driver:
- image: saltimages/salt-2019.2-py3:centos-8
- - name: fedora-31-2019-2-py3
+ image: saltimages/salt-3002.2-py3:ubuntu-16.04
+ - name: centos-8-3002-2-py3
driver:
- image: saltimages/salt-2019.2-py3:fedora-31
- - name: opensuse-leap-151-2019-2-py3
+ image: saltimages/salt-3002.2-py3:centos-8
+ - name: centos-7-3002-2-py3
driver:
- image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
+ 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.1`:
+ # 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: centos-7-2019-2-py2
+ - name: opensuse-tmbl-latest-3002-2-py3
+ driver:
+ 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: netmanagers/salt-2019.2-py2:centos-7
- - name: amazonlinux-2-2019-2-py3
+ image: saltimages/salt-3002.2-py3:oraclelinux-8
+ - name: oraclelinux-7-3002-2-py3
driver:
- image: saltimages/salt-2019.2-py3:amazonlinux-2
- - name: arch-base-latest-2019-2-py2
+ image: saltimages/salt-3002.2-py3:oraclelinux-7
+ - name: arch-base-latest-3002-2-py3
driver:
- image: saltimages/salt-2019.2-py2:arch-base-latest
+ 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 `2018.3`
- - name: fedora-30-2018-3-py3
+ ## SALT `3001.4`
+ - name: debian-10-3001-4-py3
+ driver:
+ image: saltimages/salt-3001.4-py3:debian-10
+ - name: debian-9-3001-4-py3
+ driver:
+ image: saltimages/salt-3001.4-py3:debian-9
+ - name: ubuntu-2004-3001-4-py3
driver:
- image: netmanagers/salt-2018.3-py3:fedora-30
- - name: debian-9-2018-3-py2
+ image: saltimages/salt-3001.4-py3:ubuntu-20.04
+ - name: ubuntu-1804-3001-4-py3
driver:
- image: netmanagers/salt-2018.3-py2:debian-9
- - name: ubuntu-1604-2018-3-py2
+ image: saltimages/salt-3001.4-py3:ubuntu-18.04
+ - name: ubuntu-1604-3001-4-py3
driver:
- image: netmanagers/salt-2018.3-py2:ubuntu-16.04
- - name: centos-7-2018-3-py2
+ image: saltimages/salt-3001.4-py3:ubuntu-16.04
+ - name: centos-8-3001-4-py3
driver:
- image: netmanagers/salt-2018.3-py2:centos-7
- - name: opensuse-leap-151-2018-3-py2
+ image: saltimages/salt-3001.4-py3:centos-8
+ - name: centos-7-3001-4-py3
driver:
- image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1
+ image: saltimages/salt-3001.4-py3:centos-7
+ - name: fedora-33-3001-4-py3
+ driver:
+ 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.1`:
+ # 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-1-2018-3-py2
+ - name: opensuse-tmbl-latest-3001-4-py3
driver:
- image: netmanagers/salt-2018.3-py2:amazonlinux-1
- run_command: /sbin/init
- - name: arch-base-latest-2018-3-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-3001.4-py3:amazonlinux-2
+ - name: oraclelinux-8-3001-4-py3
driver:
- image: netmanagers/salt-2018.3-py2:arch-base-latest
+ 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: gentoo-stage3-systemd-3001-4-py3
+ driver:
+ image: saltimages/salt-3001.4-py3:gentoo-stage3-systemd
- ## SALT `2017.7`
- - name: debian-8-2017-7-py2
+ ## SALT `3000.6`
+ - name: debian-10-3000-6-py3
driver:
- image: netmanagers/salt-2017.7-py2:debian-8
- - name: ubuntu-1604-2017-7-py2
+ image: saltimages/salt-3000.6-py3:debian-10
+ - name: debian-9-3000-6-py3
driver:
- image: netmanagers/salt-2017.7-py2:ubuntu-16.04
- - name: centos-6-2017-7-py2
+ image: saltimages/salt-3000.6-py3:debian-9
+ - name: ubuntu-1804-3000-6-py3
driver:
- image: netmanagers/salt-2017.7-py2:centos-6
- run_command: /sbin/init
- - name: fedora-30-2017-7-py2
+ 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: netmanagers/salt-2017.7-py2:fedora-30
- - name: opensuse-leap-151-2017-7-py2
+ image: saltimages/salt-3000.6-py3:centos-8
+ - name: centos-7-3000-6-py3
driver:
- image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1
+ 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.1`:
+ # 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-1-2017-7-py2
+ - name: amazonlinux-2-3000-6-py3
+ driver:
+ image: saltimages/salt-3000.6-py3:amazonlinux-2
+ - name: oraclelinux-8-3000-6-py3
driver:
- image: netmanagers/salt-2017.7-py2:amazonlinux-1
+ 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-2017-7-py2
+ - name: gentoo-stage3-systemd-3000-6-py3
+ driver:
+ 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: netmanagers/salt-2017.7-py2:arch-base-latest
+ 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:
@@ -169,6 +323,10 @@ suites:
- path: test/integration/default
- name: vimrc
provisioner:
+ dependencies:
+ - name: vim
+ repo: git
+ source: https://github.com/saltstack-formulas/vim-formula.git
state_top:
base:
'*':
@@ -182,10 +340,6 @@ suites:
pillars_from_files:
users.sls: test/salt/pillar/default.sls
vimrc.sls: test/salt/pillar/vimrc.sls
- dependencies:
- - name: vim
- repo: git
- source: https://github.com/saltstack-formulas/vim-formula.git
verifier:
inspec_tests:
- path: test/integration/default
diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml
index 64fe27e06f825068ad9ee3a0697291ef030d687a..064763c863944bb54fd7543c1cb0d35222ec8503 100644
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@@ -15,4 +15,7 @@ supports:
- platform-name: suse
- platform-name: freebsd
- platform-name: amazon
+ - platform-name: oracle
- platform-name: arch
+ - platform-name: gentoo
+ - platform: windows
diff --git a/test/integration/vimrc/inspec.yml b/test/integration/vimrc/inspec.yml
index cab2eb2c9e82b8db4ba25bb12e917f462cf6ae3a..586c6f7d5dd86e88aeafad7b7293ecf96a0653df 100644
--- a/test/integration/vimrc/inspec.yml
+++ b/test/integration/vimrc/inspec.yml
@@ -15,4 +15,7 @@ supports:
- platform-name: suse
- platform-name: freebsd
- platform-name: amazon
+ - platform-name: oracle
- platform-name: arch
+ - platform-name: gentoo
+ - platform: windows