Skip to content

Commit 55939d5

Browse files
committed
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
1 parent e59d88e commit 55939d5

File tree

12 files changed

+327
-276
lines changed

12 files changed

+327
-276
lines changed

.gitlab-ci.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -152,21 +152,22 @@ redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
152152
redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
153153
redhat-almalinux-8-master-py3: {extends: '.test_instance'}
154154
redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
155-
# debian-debian-11-3003-1-py3: {extends: '.test_instance'}
156-
# debian-debian-10-3003-1-py3: {extends: '.test_instance'}
157-
# debian-debian-9-3003-1-py3: {extends: '.test_instance'}
158-
# ubuntu-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
159-
# ubuntu-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
160-
# redhat-centos-8-3003-1-py3: {extends: '.test_instance'}
161-
# redhat-centos-7-3003-1-py3: {extends: '.test_instance'}
162-
# redhat-fedora-34-3003-1-py3: {extends: '.test_instance'}
163-
# redhat-fedora-33-3003-1-py3: {extends: '.test_instance'}
164-
# suse-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
165-
# suse-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
166-
# suse-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
167-
# redhat-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
168-
# redhat-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
169-
# redhat-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
155+
# debian-debian-11-3003-2-py3: {extends: '.test_instance'}
156+
# debian-debian-10-3003-2-py3: {extends: '.test_instance'}
157+
# debian-debian-9-3003-2-py3: {extends: '.test_instance'}
158+
# ubuntu-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
159+
# ubuntu-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
160+
# redhat-centos-8-3003-2-py3: {extends: '.test_instance'}
161+
# redhat-centos-7-3003-2-py3: {extends: '.test_instance'}
162+
# redhat-fedora-34-3003-2-py3: {extends: '.test_instance'}
163+
# redhat-fedora-33-3003-2-py3: {extends: '.test_instance'}
164+
# suse-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
165+
# suse-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
166+
# suse-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
167+
# redhat-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
168+
# redhat-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
169+
# redhat-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
170+
# redhat-almalinux-8-3003-2-py3: {extends: '.test_instance'}
170171
# debian-debian-11-3002-6-py3: {extends: '.test_instance'}
171172
# debian-debian-10-3002-6-py3: {extends: '.test_instance'}
172173
# debian-debian-9-3002-6-py3: {extends: '.test_instance'}

.travis.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,22 @@ jobs:
112112
- env: INSTANCE=redhat-oraclelinux-7-master-py3
113113
- env: INSTANCE=redhat-almalinux-8-master-py3
114114
- env: INSTANCE=redhat-rockylinux-8-master-py3
115-
# - env: INSTANCE=debian-debian-11-3003-1-py3
116-
# - env: INSTANCE=debian-debian-10-3003-1-py3
117-
# - env: INSTANCE=debian-debian-9-3003-1-py3
118-
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-1-py3
119-
# - env: INSTANCE=ubuntu-ubuntu-1804-3003-1-py3
120-
# - env: INSTANCE=redhat-centos-8-3003-1-py3
121-
# - env: INSTANCE=redhat-centos-7-3003-1-py3
122-
# - env: INSTANCE=redhat-fedora-34-3003-1-py3
123-
# - env: INSTANCE=redhat-fedora-33-3003-1-py3
124-
# - env: INSTANCE=suse-opensuse-leap-153-3003-1-py3
125-
# - env: INSTANCE=suse-opensuse-leap-152-3003-1-py3
126-
# - env: INSTANCE=suse-opensuse-tmbl-latest-3003-1-py3
127-
# - env: INSTANCE=redhat-amazonlinux-2-3003-1-py3
128-
# - env: INSTANCE=redhat-oraclelinux-8-3003-1-py3
129-
# - env: INSTANCE=redhat-oraclelinux-7-3003-1-py3
115+
# - env: INSTANCE=debian-debian-11-3003-2-py3
116+
# - env: INSTANCE=debian-debian-10-3003-2-py3
117+
# - env: INSTANCE=debian-debian-9-3003-2-py3
118+
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-2-py3
119+
# - env: INSTANCE=ubuntu-ubuntu-1804-3003-2-py3
120+
# - env: INSTANCE=redhat-centos-8-3003-2-py3
121+
# - env: INSTANCE=redhat-centos-7-3003-2-py3
122+
# - env: INSTANCE=redhat-fedora-34-3003-2-py3
123+
# - env: INSTANCE=redhat-fedora-33-3003-2-py3
124+
# - env: INSTANCE=suse-opensuse-leap-153-3003-2-py3
125+
# - env: INSTANCE=suse-opensuse-leap-152-3003-2-py3
126+
# - env: INSTANCE=suse-opensuse-tmbl-latest-3003-2-py3
127+
# - env: INSTANCE=redhat-amazonlinux-2-3003-2-py3
128+
# - env: INSTANCE=redhat-oraclelinux-8-3003-2-py3
129+
# - env: INSTANCE=redhat-oraclelinux-7-3003-2-py3
130+
# - env: INSTANCE=redhat-almalinux-8-3003-2-py3
130131
# - env: INSTANCE=debian-debian-11-3002-6-py3
131132
# - env: INSTANCE=debian-debian-10-3002-6-py3
132133
# - env: INSTANCE=debian-debian-9-3002-6-py3

Gemfile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
22

33
source 'https://rubygems.org'
44

5-
# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
6-
# regression where the diff isn't displayed when comparing using `eq`.
7-
gem 'inspec', '~> 4.22.22'
8-
# Install the `kitchen-docker` gem using `git` because the latest version
9-
# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
5+
# Install the `inspec` gem using `git` because versions after `4.22.22`
6+
# suppress diff output; this version fixes this for our uses.
7+
# rubocop:disable Layout/LineLength
8+
gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf'
9+
# rubocop:enable Layout/LineLength
10+
11+
# Install the `kitchen-docker` gem using `git` in order to gain a performance
12+
# improvement: avoid package installations which are already covered by the
13+
# `salt-image-builder` (i.e. the pre-salted images that we're using)
1014
# rubocop:disable Layout/LineLength
1115
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
1216
# rubocop:enable Layout/LineLength
17+
1318
gem 'kitchen-inspec', '>= 2.5.0'
1419
gem 'kitchen-salt', '>= 0.6.3'
1520

0 commit comments

Comments
 (0)