cleanup el8 config

1 files changed, 5 insertions, 113 deletions

diff --git a/el8xscl72.cfg b/el8xscl72.cfg
index 2ebd3cb..c60d867 100644
--- a/el8xscl72.cfg
+++ b/el8xscl72.cfg
@@ -1,118 +1,16 @@
-config_opts['root'] = 'scl72el8x'
-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 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['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl72el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl72el8x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
+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['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+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-5.0']
 
-config_opts['macros']['%_topdir']="/builddir/build"
 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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
 config_opts['macros']['%nophptag']="1"
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['module_enable'] = ['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-5.0']
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-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]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-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=30
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-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
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
+config_opts['yum.conf'] += """
 
 [result-scl72el8x]
 name=result-scl72el8x
@@ -120,10 +18,4 @@ baseurl=file:/var/lib/mock/scl72el8x/
 metadata_expire=30
 enabled=1
 
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-includepkgs=msodbcsql17
-
 """