ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci]

* Automated using myii/ssf-formula#293
saltstack-formulas · Feb 13, 2021 · 7568b72 · 7568b72
1 parent 3e0d85f
commit 7568b72
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 24 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -123,13 +123,22 @@ 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`
+# ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
+ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
 # ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
-ubuntu-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
-# ubuntu-ubuntu-1604-3000-3-py2: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1604-2019-2-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-master-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'}
+# 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'}
+ubuntu-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
+ubuntu-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

diff --git a/.travis.yml b/.travis.yml
@@ -83,13 +83,22 @@ 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=ubuntu-ubuntu-2004-tiamat-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-tiamat-py3
     # - env: INSTANCE=ubuntu-ubuntu-2004-master-py3
     - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3000-3-py3
-    - env: INSTANCE=ubuntu-ubuntu-1804-3000-3-py2
-    # - env: INSTANCE=ubuntu-ubuntu-1604-3000-3-py2
-    # - env: INSTANCE=ubuntu-ubuntu-1804-2019-2-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1604-2019-2-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-master-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=ubuntu-ubuntu-2004-3001-4-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-3001-4-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3001-4-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-3000-6-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3000-6-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-3000-6-py2
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3000-6-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

diff --git a/kitchen.yml b/kitchen.yml
@@ -8,35 +8,65 @@ 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: 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
+
   ## SALT `master`
   - 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
 
-  ## SALT `3000.3`
-  - name: ubuntu-1804-3000-3-py3
+  ## SALT `3002.2`
+  - name: ubuntu-2004-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:ubuntu-18.04
-  - name: ubuntu-1804-3000-3-py2
+      image: saltimages/salt-3002.2-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py2:ubuntu-18.04
-  - name: ubuntu-1604-3000-3-py2
+      image: saltimages/salt-3002.2-py3:ubuntu-18.04
+  - name: ubuntu-1604-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py2:ubuntu-16.04
+      image: saltimages/salt-3002.2-py3:ubuntu-16.04
 
-  ## SALT `2019.2`
-  - name: ubuntu-1804-2019-2-py3
+  ## SALT `3001.4`
+  - name: ubuntu-2004-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:ubuntu-20.04
+  - name: ubuntu-1804-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:ubuntu-18.04
+  - name: ubuntu-1604-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:ubuntu-16.04
+
+  ## SALT `3000.6`
+  - 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: ubuntu-1804-3000-6-py2
     driver:
-      image: saltimages/salt-2019.2-py3:ubuntu-18.04
-  - name: ubuntu-1604-2019-2-py3
+      image: saltimages/salt-3000.6-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-6-py2
     driver:
-      image: saltimages/salt-2019.2-py3:ubuntu-16.04
+      image: saltimages/salt-3000.6-py2:ubuntu-16.04
 
 provisioner:
   name: salt_solo

diff --git a/test/integration/ubuntu/inspec.yml b/test/integration/ubuntu/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