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

* Automated using myii/ssf-formula#293
saltstack-formulas · Feb 19, 2021 · af8ebe1 · af8ebe1
1 parent f5f6ba0
commit af8ebe1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -137,16 +137,17 @@ rubocop:
 clean-debian-10-master-py3: {extends: '.test_instance'}
 default-debian-9-master-py3: {extends: '.test_instance'}
 default-ubuntu-2004-master-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-master-py3: {extends: '.test_instance'}
+default-ubuntu-1804-master-py3: {extends: '.test_instance'}
+default-ubuntu-1604-master-py3: {extends: '.test_instance'}
 default-centos-8-master-py3: {extends: '.test_instance'}
-# default-centos-7-master-py3: {extends: '.test_instance'}
-# default-fedora-33-master-py3: {extends: '.test_instance'}
+default-centos-7-master-py3: {extends: '.test_instance'}
+default-fedora-33-master-py3: {extends: '.test_instance'}
 default-fedora-32-master-py3: {extends: '.test_instance'}
 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'}

diff --git a/.travis.yml b/.travis.yml
@@ -97,16 +97,17 @@ jobs:
     - env: INSTANCE=clean-debian-10-master-py3
     - env: INSTANCE=default-debian-9-master-py3
     - env: INSTANCE=default-ubuntu-2004-master-py3
-    # - env: INSTANCE=default-ubuntu-1804-master-py3
-    # - env: INSTANCE=default-ubuntu-1604-master-py3
+    - env: INSTANCE=default-ubuntu-1804-master-py3
+    - env: INSTANCE=default-ubuntu-1604-master-py3
     - env: INSTANCE=default-centos-8-master-py3
-    # - env: INSTANCE=default-centos-7-master-py3
-    # - env: INSTANCE=default-fedora-33-master-py3
+    - env: INSTANCE=default-centos-7-master-py3
+    - env: INSTANCE=default-fedora-33-master-py3
     - env: INSTANCE=default-fedora-32-master-py3
     - env: INSTANCE=default-opensuse-leap-152-master-py3
     # - 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

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
@@ -68,6 +66,10 @@ platforms:
   - name: fedora-33-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-33
+      provision_command:
+        - dnf -y update
+        - dnf install -y crypto-policies-scripts
+        - update-crypto-policies --set LEGACY
   - name: fedora-32-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-32
@@ -93,6 +95,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
@@ -126,6 +131,10 @@ platforms:
   - name: fedora-33-3002-2-py3
     driver:
       image: saltimages/salt-3002.2-py3:fedora-33
+      provision_command:
+        - dnf -y update
+        - dnf install -y crypto-policies-scripts
+        - update-crypto-policies --set LEGACY
   - name: fedora-32-3002-2-py3
     driver:
       image: saltimages/salt-3002.2-py3:fedora-32
@@ -191,6 +200,10 @@ platforms:
   - name: fedora-33-3001-4-py3
     driver:
       image: saltimages/salt-3001.4-py3:fedora-33
+      provision_command:
+        - dnf -y update
+        - dnf install -y crypto-policies-scripts
+        - update-crypto-policies --set LEGACY
   - name: fedora-32-3001-4-py3
     driver:
       image: saltimages/salt-3001.4-py3:fedora-32