fix(module): include php version in redis module package name

set the php version in the map for debian module redis to allow installation of the desired version
saltstack-formulas · Sep 14, 2021 · 55939d5 · 55939d5
1 parent e59d88e
commit 55939d5
Show file tree

Hide file tree

Showing 12 changed files with 327 additions and 276 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -152,21 +152,22 @@ redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
 redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
 redhat-almalinux-8-master-py3: {extends: '.test_instance'}
 redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
-# debian-debian-11-3003-1-py3: {extends: '.test_instance'}
-# debian-debian-10-3003-1-py3: {extends: '.test_instance'}
-# debian-debian-9-3003-1-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
-# redhat-centos-8-3003-1-py3: {extends: '.test_instance'}
-# redhat-centos-7-3003-1-py3: {extends: '.test_instance'}
-# redhat-fedora-34-3003-1-py3: {extends: '.test_instance'}
-# redhat-fedora-33-3003-1-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
-# suse-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
-# redhat-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
+# debian-debian-11-3003-2-py3: {extends: '.test_instance'}
+# debian-debian-10-3003-2-py3: {extends: '.test_instance'}
+# debian-debian-9-3003-2-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
+# redhat-centos-8-3003-2-py3: {extends: '.test_instance'}
+# redhat-centos-7-3003-2-py3: {extends: '.test_instance'}
+# redhat-fedora-34-3003-2-py3: {extends: '.test_instance'}
+# redhat-fedora-33-3003-2-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
+# suse-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
+# redhat-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
+# redhat-almalinux-8-3003-2-py3: {extends: '.test_instance'}
 # debian-debian-11-3002-6-py3: {extends: '.test_instance'}
 # debian-debian-10-3002-6-py3: {extends: '.test_instance'}
 # debian-debian-9-3002-6-py3: {extends: '.test_instance'}

diff --git a/.travis.yml b/.travis.yml
@@ -112,21 +112,22 @@ jobs:
     - env: INSTANCE=redhat-oraclelinux-7-master-py3
     - env: INSTANCE=redhat-almalinux-8-master-py3
     - env: INSTANCE=redhat-rockylinux-8-master-py3
-    # - env: INSTANCE=debian-debian-11-3003-1-py3
-    # - env: INSTANCE=debian-debian-10-3003-1-py3
-    # - env: INSTANCE=debian-debian-9-3003-1-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3003-1-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3003-1-py3
-    # - env: INSTANCE=redhat-centos-8-3003-1-py3
-    # - env: INSTANCE=redhat-centos-7-3003-1-py3
-    # - env: INSTANCE=redhat-fedora-34-3003-1-py3
-    # - env: INSTANCE=redhat-fedora-33-3003-1-py3
-    # - env: INSTANCE=suse-opensuse-leap-153-3003-1-py3
-    # - env: INSTANCE=suse-opensuse-leap-152-3003-1-py3
-    # - env: INSTANCE=suse-opensuse-tmbl-latest-3003-1-py3
-    # - env: INSTANCE=redhat-amazonlinux-2-3003-1-py3
-    # - env: INSTANCE=redhat-oraclelinux-8-3003-1-py3
-    # - env: INSTANCE=redhat-oraclelinux-7-3003-1-py3
+    # - env: INSTANCE=debian-debian-11-3003-2-py3
+    # - env: INSTANCE=debian-debian-10-3003-2-py3
+    # - env: INSTANCE=debian-debian-9-3003-2-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3003-2-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3003-2-py3
+    # - env: INSTANCE=redhat-centos-8-3003-2-py3
+    # - env: INSTANCE=redhat-centos-7-3003-2-py3
+    # - env: INSTANCE=redhat-fedora-34-3003-2-py3
+    # - env: INSTANCE=redhat-fedora-33-3003-2-py3
+    # - env: INSTANCE=suse-opensuse-leap-153-3003-2-py3
+    # - env: INSTANCE=suse-opensuse-leap-152-3003-2-py3
+    # - env: INSTANCE=suse-opensuse-tmbl-latest-3003-2-py3
+    # - env: INSTANCE=redhat-amazonlinux-2-3003-2-py3
+    # - env: INSTANCE=redhat-oraclelinux-8-3003-2-py3
+    # - env: INSTANCE=redhat-oraclelinux-7-3003-2-py3
+    # - env: INSTANCE=redhat-almalinux-8-3003-2-py3
     # - env: INSTANCE=debian-debian-11-3002-6-py3
     # - env: INSTANCE=debian-debian-10-3002-6-py3
     # - env: INSTANCE=debian-debian-9-3002-6-py3

diff --git a/Gemfile b/Gemfile
@@ -2,14 +2,19 @@
 
 source 'https://rubygems.org'
 
-# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
-# regression where the diff isn't displayed when comparing using `eq`.
-gem 'inspec',      '~> 4.22.22'
-# Install the `kitchen-docker` gem using `git` because the latest version
-# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
+# Install the `inspec` gem using `git` because versions after `4.22.22`
+# suppress diff output; this version fixes this for our uses.
+# rubocop:disable Layout/LineLength
+gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf'
+# rubocop:enable Layout/LineLength
+
+# Install the `kitchen-docker` gem using `git` in order to gain a performance
+# improvement: avoid package installations which are already covered by the
+# `salt-image-builder` (i.e. the pre-salted images that we're using)
 # rubocop:disable Layout/LineLength
 gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
 # rubocop:enable Layout/LineLength
+
 gem 'kitchen-inspec', '>= 2.5.0'
 gem 'kitchen-salt', '>= 0.6.3'