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

* Automated using myii/ssf-formula#293
saltstack-formulas · Feb 14, 2021 · 8eeb429 · 8eeb429
1 parent a55dada
commit 8eeb429
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -146,6 +146,7 @@ default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-master-py3: {extends: '.test_instance'}
+default-oraclelinux-7-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # default-debian-10-3002-2-py3: {extends: '.test_instance'}
@@ -161,7 +162,7 @@ default-amazonlinux-2-master-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-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'}

diff --git a/.travis.yml b/.travis.yml
@@ -106,6 +106,7 @@ jobs:
     - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
     - env: INSTANCE=default-amazonlinux-2-master-py3
     # - env: INSTANCE=default-oraclelinux-8-master-py3
+    - env: INSTANCE=default-oraclelinux-7-master-py3
     # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
     # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
     # - env: INSTANCE=default-debian-10-3002-2-py3
@@ -121,7 +122,7 @@ jobs:
     # - 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-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

diff --git 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