From 014ac4aeeae931fef350b2e2f3244585d5241cdd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 7 Dec 2018 11:30:18 +0100
Subject: more EL-8 changes

---
 el8x.cfg   | 29 +++++++++++++++++++++++------
 el8x72.cfg |  2 +-
 el8x73.cfg |  4 ++--
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/el8x.cfg b/el8x.cfg
index ceded11..91ff339 100644
--- a/el8x.cfg
+++ b/el8x.cfg
@@ -1,7 +1,7 @@
 config_opts['root'] = 'el8x'
 config_opts['target_arch'] = 'x86_64'
 #config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 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'
 config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '8'
@@ -32,6 +32,8 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
 
+config_opts['module_enable'] = ['nodejs:10', 'sos-collector:rhel8', 'postgresql:10', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-5.0']
+
 config_opts['yum.conf'] = """
 [main]
 keepcache=1
@@ -45,6 +47,9 @@ assumeyes=1
 metadata_expire=80000
 fastestmirror=1
 max_parallel_downloads=6
+modules=1
+module_hotfixes=1
+module_platform_id=platform:el8
 
 # repos
 [rhel-8-baseos]
@@ -61,19 +66,31 @@ enabled=1
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
 enabled=1
-metadata_expire=15
+metadata_expire=30
+
+[remi-modular]
+name=remi modular
+baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
+enabled=1
+metadata_expire=30
 
 [remi-priv]
 name=remi prive
 baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
 enabled=1
-metadata_expire=15
+metadata_expire=30
 
 [remi-priv-el8]
 name=remi prive el8
 baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
 enabled=1
-metadata_expire=15
+metadata_expire=30
+
+[remi-bootstrap]
+name=remi bootstrap
+baseurl=file:/home/rpmbuild/site/rpms/priv/el8.noarch/
+enabled=1
+metadata_expire=30
 
 [remi-test]
 name=remi test
@@ -88,12 +105,12 @@ enabled=1
 [result-el8x]
 name=result-el8x
 baseurl=file:/var/lib/mock/el8x/
-metadata_expire=15
+metadata_expire=30
 enabled=1
 
 [msprod]
 name=msprod
-baseurl=https://packages.microsoft.com/rhel/8/prod/
+baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=0
 includepkgs=msodbcsql
 
diff --git a/el8x72.cfg b/el8x72.cfg
index c84e59f..6cbc1f4 100644
--- a/el8x72.cfg
+++ b/el8x72.cfg
@@ -32,7 +32,7 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
 
-config_opts['module_enable'] = ['postgresql:10', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-5.0']
+config_opts['module_enable'] = ['sos-collector:rhel8', 'postgresql:10', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-5.0']
 
 config_opts['yum.conf'] = """
 [main]
diff --git a/el8x73.cfg b/el8x73.cfg
index 745c6db..ed4d284 100644
--- a/el8x73.cfg
+++ b/el8x73.cfg
@@ -32,7 +32,7 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
 
-config_opts['module_enable'] = ['postgresql:10', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.3', 'redis:remi-5.0']
+config_opts['module_enable'] = ['sos-collector:rhel8', 'postgresql:10', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.3', 'redis:remi-5.0']
 
 config_opts['yum.conf'] = """
 [main]
@@ -47,7 +47,7 @@ assumeyes=1
 metadata_expire=80000
 fastestmirror=1
 max_parallel_downloads=6
-modules=1
+modules=0
 module_hotfixes=1
 module_platform_id=platform:el8
 
-- 
cgit