cleanup el7 config

1 files changed, 10 insertions, 30 deletions

diff --git a/el7xscl56.cfg b/el7xscl56.cfg
index 59de2ff..db89aa2 100644
--- a/el7xscl56.cfg
+++ b/el7xscl56.cfg
@@ -1,31 +1,11 @@
-config_opts['root'] = 'scl56el7x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php56-build devtoolset-6-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/"
+include('el7x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl56el7x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php56-build devtoolset-6-toolchain'
 config_opts['resultdir'] = "/var/lib/mock/scl56el7x"
-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']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-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['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
@@ -44,7 +24,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]
@@ -84,28 +64,28 @@ 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=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-php55]
 name=remi php55
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/php55/x86_64/
+baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php55/x86_64/
 enabled=0
 
 [remi-php56]
 name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/php56/x86_64/
+baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php56/x86_64/
 enabled=0
 
 [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]
@@ -126,7 +106,7 @@ enabled=0
 
 [result]
 name=result
-baseurl=file:/var/lib/mock/scl56el7x/
+baseurl=file:///var/lib/mock/scl56el7x/
 enabled=1