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

set the php version in the map for debian and ubuntu of module redis to allow installation of the desired version
saltstack-formulas · Sep 14, 2021 · 2f62f6f · 2f62f6f
2 parents d32cd2c + 55939d5
commit 2f62f6f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 16 deletions.
diff --git a/php/map.jinja b/php/map.jinja
@@ -79,7 +79,7 @@
                             'phpenmod_command': 'phpenmod -v' + php_version,
                             'pspell': 'php' + php_version + '-pspell',
                             'readline': 'php' + php_version + '-readline',
-                            'redis': 'php-redis',
+                            'redis': 'php' + php_version + '-redis',
                             'seclib': ['php-phpseclib', 'php-seclib'],
                             'snmp': 'php' + php_version + '-snmp',
                             'soap': 'php' + php_version + '-soap',
@@ -772,7 +772,7 @@
                             'php': 'php',
                             'phpenmod_command': 'phpenmod',
                             'pspell': 'php-pspell',
-                            'redis': 'php-redis',
+                            'redis': 'php' + php_version + '-redis',
                             'seclib': ['php-phpseclib', 'php-seclib'],
                             'snmp': 'php-snmp',
                             'soap': 'php-soap',
@@ -1165,7 +1165,7 @@
                             'php': 'php',
                             'phpenmod_command': 'phpenmod',
                             'pspell': 'php-pspell',
-                            'redis': 'php-redis',
+                            'redis': 'php' + php_version + '-redis',
                             'seclib': ['php-phpseclib', 'php-seclib'],
                             'snmp': 'php-snmp',
                             'soap': 'php-soap',
@@ -1558,7 +1558,7 @@
                             'php': 'php',
                             'phpenmod_command': 'phpenmod',
                             'pspell': 'php-pspell',
-                            'redis': 'php-redis',
+                            'redis': 'php' + php_version + '-redis',
                             'seclib': ['php-phpseclib', 'php-seclib'],
                             'snmp': 'php-snmp',
                             'soap': 'php-soap',
@@ -2387,7 +2387,7 @@
                             'phpenmod_command': 'phpenmod -v' + php_version,
                             'pspell': 'php' + php_version + '-pspell',
                             'readline': 'php' + php_version + '-readline',
-                            'redis': 'php-redis',
+                            'redis': 'php' + php_version + '-redis',
                             'seclib': ['php-phpseclib', 'php-seclib'],
                             'snmp': 'php' + php_version + '-snmp',
                             'soap': 'php' + php_version + '-soap',

diff --git a/test/integration/default/controls/package_spec.rb b/test/integration/default/controls/package_spec.rb
@@ -9,17 +9,13 @@ def test_debian
       it { should be_installed }
     end
 
-    describe package('php-redis') do
-      it { should be_installed }
-    end
-
     describe package('php-xdebug') do
       it { should be_installed }
     end
 
     %w[
       bz2 cli curl fpm gd imap intl mbstring
-      mysql readline xml zip
+      mysql readline redis xml zip
     ].each do |pkg|
       describe package("php5.6-#{pkg}") do
         it { should be_installed }

diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -344,7 +344,7 @@ values:
       phpenmod_command: phpenmod -v5.6
       pspell: php5.6-pspell
       readline: php5.6-readline
-      redis: php-redis
+      redis: php5.6-redis
       seclib:
       - php-phpseclib
       - php-seclib

diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -344,7 +344,7 @@ values:
       phpenmod_command: phpenmod -v5.6
       pspell: php5.6-pspell
       readline: php5.6-readline
-      redis: php-redis
+      redis: php5.6-redis
       seclib:
       - php-phpseclib
       - php-seclib

diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -344,7 +344,7 @@ values:
       phpenmod_command: phpenmod -v5.6
       pspell: php5.6-pspell
       readline: php5.6-readline
-      redis: php-redis
+      redis: php5.6-redis
       seclib:
       - php-phpseclib
       - php-seclib

diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -342,7 +342,7 @@ values:
       phpenmod_command: phpenmod -v5.6
       pspell: php5.6-pspell
       readline: php5.6-readline
-      redis: php-redis
+      redis: php5.6-redis
       seclib:
       - php-phpseclib
       - php-seclib

diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -342,7 +342,7 @@ values:
       phpenmod_command: phpenmod -v5.6
       pspell: php5.6-pspell
       readline: php5.6-readline
-      redis: php-redis
+      redis: php5.6-redis
       seclib:
       - php-phpseclib
       - php-seclib

diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -342,7 +342,7 @@ values:
       phpenmod_command: phpenmod -v5.6
       pspell: php5.6-pspell
       readline: php5.6-readline
-      redis: php-redis
+      redis: php5.6-redis
       seclib:
       - php-phpseclib
       - php-seclib