From b1f94e991acc30a2c49a5768c369b30f650316f4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 2 Aug 2023 16:15:15 +0200 Subject: switch to redis 7 by default --- el8x.tpl | 2 +- el8x72.cfg | 2 +- el8x73.cfg | 2 +- el8x74.cfg | 2 +- el8x80.cfg | 2 +- el8x81.cfg | 2 +- el8x82.cfg | 2 +- el8xscl56.cfg | 2 +- el8xscl70.cfg | 2 +- el8xscl71.cfg | 2 +- el8xscl72.cfg | 2 +- el8xscl73.cfg | 2 +- el8xscl74.cfg | 2 +- el8xscl80.cfg | 2 +- el8xscl81.cfg | 2 +- el8xscl82.cfg | 2 +- el8xscl83.cfg | 2 +- el9a.tpl | 2 +- el9x.tpl | 2 +- el9x74.cfg | 2 +- el9x80.cfg | 2 +- el9x81.cfg | 2 +- el9x82.cfg | 2 +- fc36x.tpl | 18 +++++++++++++----- 24 files changed, 36 insertions(+), 28 deletions(-) diff --git a/el8x.tpl b/el8x.tpl index 763459b..82dcdf6 100644 --- a/el8x.tpl +++ b/el8x.tpl @@ -29,7 +29,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-8.0', '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-8.0', 'redis:remi-7.0'] config_opts['yum.conf'] = """ [main] diff --git a/el8x72.cfg b/el8x72.cfg index 9b5a403..dc250ad 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-6.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-7.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 1bbe592..94d79fe 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-6.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-7.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 0da2d9c..f13c4d1 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-6.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-7.0'] config_opts['module_install'] = ['php:remi-7.4/devel'] nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); diff --git a/el8x80.cfg b/el8x80.cfg index 9997cf4..9dd6c1e 100644 --- a/el8x80.cfg +++ b/el8x80.cfg @@ -5,7 +5,7 @@ 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-8.0', 'redis:remi-6.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-7.0'] config_opts['module_install'] = ['php:remi-8.0/devel'] nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); diff --git a/el8x81.cfg b/el8x81.cfg index 6cbb11a..ecaa2a9 100644 --- a/el8x81.cfg +++ b/el8x81.cfg @@ -5,7 +5,7 @@ include('el8x.tpl') config_opts['root'] = 'el8x81' config_opts['resultdir'] = "/var/lib/mock/el8x81" -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.1', 'redis:remi-6.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.1', 'redis:remi-7.0'] config_opts['module_install'] = ['php:remi-8.1/devel'] nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); diff --git a/el8x82.cfg b/el8x82.cfg index 9867cb3..739621a 100644 --- a/el8x82.cfg +++ b/el8x82.cfg @@ -5,7 +5,7 @@ include('el8x.tpl') config_opts['root'] = 'el8x82' config_opts['resultdir'] = "/var/lib/mock/el8x82" -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.2', 'redis:remi-6.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.2', 'redis:remi-7.0'] config_opts['module_install'] = ['php:remi-8.2/devel'] nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); diff --git a/el8xscl56.cfg b/el8xscl56.cfg index 95397cd..e82f52f 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-6.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-7.0'] config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" diff --git a/el8xscl70.cfg b/el8xscl70.cfg index 5ae6182..8e928a2 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-6.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-7.0'] config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" diff --git a/el8xscl71.cfg b/el8xscl71.cfg index 85c20e1..6c8c972 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-6.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-7.0'] config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" diff --git a/el8xscl72.cfg b/el8xscl72.cfg index 91dd2f9..cb1e2f0 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-6.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-7.0'] config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" diff --git a/el8xscl73.cfg b/el8xscl73.cfg index 7cfa70d..eafc94c 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-6.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-7.0'] config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" diff --git a/el8xscl74.cfg b/el8xscl74.cfg index ccf8250..fee5b14 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-6.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-7.0'] config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" diff --git a/el8xscl80.cfg b/el8xscl80.cfg index e0ff8cd..4a2ae50 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-6.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-7.0'] config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" diff --git a/el8xscl81.cfg b/el8xscl81.cfg index d713060..4d69b71 100644 --- a/el8xscl81.cfg +++ b/el8xscl81.cfg @@ -4,7 +4,7 @@ config_opts['root'] = 'scl81el8x' config_opts['resultdir'] = "/var/lib/mock/scl81el8x" 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 php81-build php81-php-devel php81-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-6.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-7.0'] config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" diff --git a/el8xscl82.cfg b/el8xscl82.cfg index da76b28..c1e6ffb 100644 --- a/el8xscl82.cfg +++ b/el8xscl82.cfg @@ -4,7 +4,7 @@ config_opts['root'] = 'scl82el8x' config_opts['resultdir'] = "/var/lib/mock/scl82el8x" 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 php82-build php82-php-devel php82-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-6.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-7.0'] config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" diff --git a/el8xscl83.cfg b/el8xscl83.cfg index 17bfb28..f41d89d 100644 --- a/el8xscl83.cfg +++ b/el8xscl83.cfg @@ -4,7 +4,7 @@ config_opts['root'] = 'scl83el8x' config_opts['resultdir'] = "/var/lib/mock/scl83el8x" 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 php83-build php83-php-devel php83-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-6.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-7.0'] config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" diff --git a/el9a.tpl b/el9a.tpl index 4e2e7ba..6a6f50a 100644 --- a/el9a.tpl +++ b/el9a.tpl @@ -29,7 +29,7 @@ config_opts['macros']['%runselftest']="0" config_opts['environment']['ACCEPT_EULA'] = 'Y' -# config_opts['module_enable'] = ['php:remi-8.0'] +config_opts['module_enable'] = ['php:remi-8.0', 'redis:remi-7.0'] config_opts['yum.conf'] = """ [main] diff --git a/el9x.tpl b/el9x.tpl index efb25d8..f14a85d 100644 --- a/el9x.tpl +++ b/el9x.tpl @@ -29,7 +29,7 @@ config_opts['macros']['%runselftest']="1" config_opts['environment']['ACCEPT_EULA'] = 'Y' -config_opts['module_enable'] = ['php:remi-8.0'] +config_opts['module_enable'] = ['php:remi-8.0', 'redis:remi-7.0'] config_opts['yum.conf'] = """ [main] diff --git a/el9x74.cfg b/el9x74.cfg index 7df80a8..3ff6aa0 100644 --- a/el9x74.cfg +++ b/el9x74.cfg @@ -5,7 +5,7 @@ include('el9x.tpl') config_opts['root'] = 'el9x74' config_opts['resultdir'] = "/var/lib/mock/el9x74" -config_opts['module_enable'] = ['php:remi-7.4'] +config_opts['module_enable'] = ['php:remi-7.4', 'redis:remi-7.0'] config_opts['module_install'] = ['php:remi-7.4/devel'] nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); diff --git a/el9x80.cfg b/el9x80.cfg index 0ef66ad..7535943 100644 --- a/el9x80.cfg +++ b/el9x80.cfg @@ -5,7 +5,7 @@ include('el9x.tpl') config_opts['root'] = 'el9x80' config_opts['resultdir'] = "/var/lib/mock/el9x80" -config_opts['module_enable'] = ['php:remi-8.0'] +config_opts['module_enable'] = ['php:remi-8.0', 'redis:remi-7.0'] config_opts['module_install'] = ['php:remi-8.0/devel'] nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); diff --git a/el9x81.cfg b/el9x81.cfg index 3ac7ad1..c32fcab 100644 --- a/el9x81.cfg +++ b/el9x81.cfg @@ -5,7 +5,7 @@ include('el9x.tpl') config_opts['root'] = 'el9x81' config_opts['resultdir'] = "/var/lib/mock/el9x81" -config_opts['module_enable'] = ['php:remi-8.1'] +config_opts['module_enable'] = ['php:remi-8.1', 'redis:remi-7.0'] config_opts['module_install'] = ['php:remi-8.1/devel'] nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); diff --git a/el9x82.cfg b/el9x82.cfg index 262a9f0..6e90af7 100644 --- a/el9x82.cfg +++ b/el9x82.cfg @@ -5,7 +5,7 @@ include('el9x.tpl') config_opts['root'] = 'el9x82' config_opts['resultdir'] = "/var/lib/mock/el9x82" -config_opts['module_enable'] = ['php:remi-8.2'] +config_opts['module_enable'] = ['php:remi-8.2', 'redis:remi-7.0'] config_opts['module_install'] = ['php:remi-8.2/devel'] nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); diff --git a/fc36x.tpl b/fc36x.tpl index eaa9c4f..439c161 100644 --- a/fc36x.tpl +++ b/fc36x.tpl @@ -28,6 +28,8 @@ config_opts['macros']['%_with_ibase']="1" config_opts['macros']['%_with_oci8']="1" config_opts['macros']['%runselftest']="1" +config_opts['module_enable'] = ['redis:remi-7.0'] + config_opts['environment']['ACCEPT_EULA'] = 'Y' config_opts['yum.conf'] = """ @@ -48,28 +50,28 @@ max_parallel_downloads=6 [fedora] name=fedora -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch +#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch metadata_expire=80000 ##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-36&arch=x86_64 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/36/Everything/x86_64/os/ # http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/36/Everything/x86_64/os/ -#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/36/Everything/x86_64/os/ +baseurl=https://dl.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/x86_64/os/ [updates] name=updates -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch +#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f36&arch=x86_64 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/ # http://mirrors.ircam.fr/pub/fedora/linux/updates/36/x86_64/ # http://fr2.rpmfind.net/linux/fedora/updates/36/x86_64/ -#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/ +baseurl=https://dl.fedoraproject.org/pub/archive/fedora/linux/updates/36/Everything/x86_64/ enabled=1 [updates-testing] name=updates-testing #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f36&arch=x86_64 -baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/36/Everything/x86_64/ +baseurl=https://dl.fedoraproject.org/pub/archive/fedora/linux/updates/testing/36/Everything/x86_64/ enabled=0 [remi] @@ -78,6 +80,12 @@ baseurl=file:/home/rpmbuild/site/rpms/fedora/36/remi/x86_64/ enabled=1 metadata_expire=10 +[remi-modular] +name=remi modular +baseurl=file:/home/rpmbuild/site/rpms/fedora/36/modular/x86_64/ +enabled=1 +metadata_expire=10 + [remi-priv] name=remi prive baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/ -- cgit