From f8b7a8968481da2eaef7c82fe72dfadcd6350eca Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 11 Sep 2020 14:38:45 +0200
Subject: also use redis 6.0 for EL8 build

---
 el8x72.cfg    | 2 +-
 el8x73.cfg    | 2 +-
 el8x74.cfg    | 2 +-
 el8x80.cfg    | 4 ++--
 el8xp.cfg     | 2 +-
 el8xscl56.cfg | 2 +-
 el8xscl70.cfg | 2 +-
 el8xscl71.cfg | 2 +-
 el8xscl72.cfg | 2 +-
 el8xscl73.cfg | 2 +-
 el8xscl74.cfg | 2 +-
 el8xscl80.cfg | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/el8x72.cfg b/el8x72.cfg
index c42f641..503d406 100644
--- a/el8x72.cfg
+++ b/el8x72.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x72'
 config_opts['resultdir'] = "/var/lib/mock/el8x72"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-5.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-6.0']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
diff --git a/el8x73.cfg b/el8x73.cfg
index 6bc1599..4675b2a 100644
--- a/el8x73.cfg
+++ b/el8x73.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x73'
 config_opts['resultdir'] = "/var/lib/mock/el8x73"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.3', 'redis:remi-5.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.3', 'redis:remi-6.0']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
diff --git a/el8x74.cfg b/el8x74.cfg
index 065807b..097f027 100644
--- a/el8x74.cfg
+++ b/el8x74.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x74'
 config_opts['resultdir'] = "/var/lib/mock/el8x74"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.4', 'redis:remi-5.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.4', 'redis:remi-6.0']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
diff --git a/el8x80.cfg b/el8x80.cfg
index 498e4aa..ad9c605 100644
--- a/el8x80.cfg
+++ b/el8x80.cfg
@@ -5,12 +5,12 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x80'
 config_opts['resultdir'] = "/var/lib/mock/el8x80"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.4', 'redis:remi-5.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.0', 'redis:remi-6.0']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
-config_opts['macros']['%_module_stream']="remi-7.4"
+config_opts['macros']['%_module_stream']="remi-8.0"
 config_opts['macros']['%_module_version']="80200" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
diff --git a/el8xp.cfg b/el8xp.cfg
index 255ee76..5ff571a 100644
--- a/el8xp.cfg
+++ b/el8xp.cfg
@@ -32,7 +32,7 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
 
-config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-5.0']
+config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-6.0']
 
 config_opts['yum.conf'] = """
 [main]
diff --git a/el8xscl56.cfg b/el8xscl56.cfg
index 81e4e79..a22352c 100644
--- a/el8xscl56.cfg
+++ b/el8xscl56.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl56el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl56el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php56-build'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-6.0']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl70.cfg b/el8xscl70.cfg
index bbf1c54..5ae6182 100644
--- a/el8xscl70.cfg
+++ b/el8xscl70.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl70el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl70el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php70-build'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-6.0']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl71.cfg b/el8xscl71.cfg
index 567f186..85c20e1 100644
--- a/el8xscl71.cfg
+++ b/el8xscl71.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl71el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl71el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php71-build'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-6.0']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl72.cfg b/el8xscl72.cfg
index 841e8b6..91dd2f9 100644
--- a/el8xscl72.cfg
+++ b/el8xscl72.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl72el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl72el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php72-build php72-php-devel php72-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-6.0']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl73.cfg b/el8xscl73.cfg
index 32d62d7..7cfa70d 100644
--- a/el8xscl73.cfg
+++ b/el8xscl73.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl73el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl73el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php73-build php73-php-devel php73-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-6.0']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl74.cfg b/el8xscl74.cfg
index 0c03ec9..ccf8250 100644
--- a/el8xscl74.cfg
+++ b/el8xscl74.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl74el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl74el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php74-build php74-php-devel php74-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-6.0']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl80.cfg b/el8xscl80.cfg
index 6297dfa..e0ff8cd 100644
--- a/el8xscl80.cfg
+++ b/el8xscl80.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl80el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl80el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php80-build php80-php-devel php80-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-6.0']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-- 
cgit