cleanup el7 config

1 files changed, 8 insertions, 34 deletions

diff --git a/el7x74.cfg b/el7x74.cfg
index a6858c8..c6d4686 100644
--- a/el7x74.cfg
+++ b/el7x74.cfg
@@ -1,35 +1,9 @@
-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"
+include('el7x.tpl')
+
 config_opts['macros']['%dtsversion']="8"
 config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-8/enable"
 config_opts['macros']['%dtsprefix']="devtoolset-8-"
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum
@@ -46,7 +20,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
 exclude=libicu-devel
 
@@ -87,23 +61,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-*  libicu-last-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-php74]
 name=remi php74
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/php74/x86_64/
+baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php74/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]
@@ -124,7 +98,7 @@ enabled=0
 
 [result]
 name=result
-baseurl=file:/var/lib/mock/el7x/
+baseurl=file:///var/lib/mock/el7x/
 enabled=1
 
 [centos-sclo-rh]