From fb9901e3acd334fc91f21abab4089a53977f6061 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sun, 14 Feb 2021 07:44:21 +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                        | 3 +++
 .travis.yml                           | 3 +++
 kitchen.yml                           | 8 ++++++--
 test/integration/v3000-py2/inspec.yml | 1 +
 test/integration/v3001-py3/inspec.yml | 1 +
 test/integration/v3002-py3/inspec.yml | 1 +
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bf86ee..8ffbb5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,6 +137,7 @@ v3002-py3-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
 v3002-py3-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
 v3002-py3-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
 v3002-py3-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
+# v3002-py3-arch-base-latest-3002-2-py3: {extends: '.test_instance'}
 v3002-py3-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
 v3002-py3-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
 v3001-py3-debian-10-3001-4-py3: {extends: '.test_instance'}
@@ -153,6 +154,7 @@ v3001-py3-fedora-32-3001-4-py3: {extends: '.test_instance'}
 # v3001-py3-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
 v3001-py3-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
 # v3001-py3-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
+# v3001-py3-arch-base-latest-3001-4-py3: {extends: '.test_instance'}
 # v3001-py3-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
 # v3001-py3-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
 # v3000-py3-debian-10-3000-6-py3: {extends: '.test_instance'}
@@ -169,6 +171,7 @@ v3000-py3-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
 # v3000-py3-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
 # v3000-py2-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
 v3000-py2-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
+# v3000-py2-arch-base-latest-3000-6-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`
diff --git a/.travis.yml b/.travis.yml
index 6d08a3d..f38bc2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,6 +97,7 @@ jobs:
     - env: INSTANCE=v3002-py3-amazonlinux-2-3002-2-py3
     - env: INSTANCE=v3002-py3-oraclelinux-8-3002-2-py3
     - env: INSTANCE=v3002-py3-oraclelinux-7-3002-2-py3
+    # - env: INSTANCE=v3002-py3-arch-base-latest-3002-2-py3
     - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-2-py3
     - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-2-py3
     - env: INSTANCE=v3001-py3-debian-10-3001-4-py3
@@ -113,6 +114,7 @@ jobs:
     # - env: INSTANCE=v3001-py3-amazonlinux-2-3001-4-py3
     - env: INSTANCE=v3001-py3-oraclelinux-8-3001-4-py3
     # - env: INSTANCE=v3001-py3-oraclelinux-7-3001-4-py3
+    # - env: INSTANCE=v3001-py3-arch-base-latest-3001-4-py3
     # - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-4-py3
     # - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-4-py3
     # - env: INSTANCE=v3000-py3-debian-10-3000-6-py3
@@ -129,6 +131,7 @@ jobs:
     # - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-6-py3
     # - env: INSTANCE=v3000-py2-ubuntu-1804-3000-6-py2
     - env: INSTANCE=v3000-py2-ubuntu-1604-3000-6-py2
+    # - env: INSTANCE=v3000-py2-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 25e6ded..b0d603c 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -8,8 +8,6 @@ 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
@@ -93,6 +91,9 @@ platforms:
   - 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
@@ -320,6 +321,7 @@ suites:
       - amazonlinux-2-3002-2-py3
       - oraclelinux-8-3002-2-py3
       - oraclelinux-7-3002-2-py3
+      - arch-base-latest-3002-2-py3
       - gentoo-stage3-latest-3002-2-py3
       - gentoo-stage3-systemd-3002-2-py3
     provisioner:
@@ -358,6 +360,7 @@ suites:
       - amazonlinux-2-3001-4-py3
       - oraclelinux-8-3001-4-py3
       - oraclelinux-7-3001-4-py3
+      - arch-base-latest-3001-4-py3
       - gentoo-stage3-latest-3001-4-py3
       - gentoo-stage3-systemd-3001-4-py3
     provisioner:
@@ -418,6 +421,7 @@ suites:
     includes:
       - ubuntu-1804-3000-6-py2
       - ubuntu-1604-3000-6-py2
+      - arch-base-latest-3000-6-py2
     provisioner:
       state_top:
         base:
diff --git a/test/integration/v3000-py2/inspec.yml b/test/integration/v3000-py2/inspec.yml
index 14d9876..e57795f 100644
--- a/test/integration/v3000-py2/inspec.yml
+++ b/test/integration/v3000-py2/inspec.yml
@@ -21,3 +21,4 @@ supports:
   - platform-name: oracle
   - platform-name: arch
   - platform-name: gentoo
+  - platform: windows
diff --git a/test/integration/v3001-py3/inspec.yml b/test/integration/v3001-py3/inspec.yml
index 0e6c84b..bce546e 100644
--- a/test/integration/v3001-py3/inspec.yml
+++ b/test/integration/v3001-py3/inspec.yml
@@ -21,3 +21,4 @@ supports:
   - platform-name: oracle
   - platform-name: arch
   - platform-name: gentoo
+  - platform: windows
diff --git a/test/integration/v3002-py3/inspec.yml b/test/integration/v3002-py3/inspec.yml
index 0db02cd..40ebc1e 100644
--- a/test/integration/v3002-py3/inspec.yml
+++ b/test/integration/v3002-py3/inspec.yml
@@ -21,3 +21,4 @@ supports:
   - platform-name: oracle
   - platform-name: arch
   - platform-name: gentoo
+  - platform: windows