From 1f709fc011234894ba6c3ca12b4c6645aad67bf4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 13 Feb 2020 17:13:13 +0100
Subject: cleanup el7 config

---
 el7x70.cfg | 41 +++++++----------------------------------
 1 file changed, 7 insertions(+), 34 deletions(-)

(limited to 'el7x70.cfg')

diff --git a/el7x70.cfg b/el7x70.cfg
index 0398c82..2dcb61d 100644
--- a/el7x70.cfg
+++ b/el7x70.cfg
@@ -1,31 +1,4 @@
-config_opts['root'] = 'el7x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache devtoolset-6-toolchain devtoolset-7-toolchain devtoolset-8-toolchain'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el7x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/el7x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".el7.remi"
-config_opts['macros']['%rhel']="7"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
+include('el7x.tpl')
 
 config_opts['yum.conf'] = """
 [main]
@@ -43,7 +16,7 @@ syslog_device=
 # repos
 [rhel-7]
 name=rhel-7
-baseurl=file:/mnt/rhel-7-x86_64/
+baseurl=file:///mnt/rhel-7-x86_64/
 enabled=1
 
 [rc]
@@ -83,23 +56,23 @@ enabled=0
 
 [remi]
 name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
+baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
 enabled=1
 exclude=php-pecl-* libicu62-devel
 
 [remi-test]
 name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
+baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
 enabled=0
 
 [remi-php70]
 name=remi php70
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/php70/x86_64/
+baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php70/x86_64/
 enabled=1
 
 [remi-priv]
 name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/el7.x86_64/
+baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
 enabled=1
 
 [rpmfusion-free]
@@ -120,7 +93,7 @@ enabled=0
 
 [result]
 name=result
-baseurl=file:/var/lib/mock/el7x/
+baseurl=file:///var/lib/mock/el7x/
 enabled=1
 
 [msprod]
-- 
cgit