tweak f25 mock config again

11 files changed, 160 insertions, 51 deletions

diff --git a/fc25i.cfg b/fc25i.cfg
index 0be7fde..9a43fde 100644
--- a/fc25i.cfg
+++ b/fc25i.cfg
@@ -1,7 +1,9 @@
 config_opts['root'] = 'fc25i'
 config_opts['target_arch'] = 'i686'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
@@ -30,13 +32,15 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-debuglevel=1
+keepcache=1
+debuglevel=2
 reposdir=/dev/null
 logfile=/var/log/yum.log
 retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+metadata_expire=10
 fastestmirror=1
 max_parallel_downloads=6
 
@@ -44,13 +48,17 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=i386
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=i386
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/25/Everything/i386/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/25/Everything/i386/os/
 
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=i386
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=i386
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/25/i386/
 #	http://mirrors.ircam.fr/pub/fedora/linux/updates/25/i386/
 #	http://fr2.rpmfind.net/linux/fedora/updates/25/i386/
@@ -58,8 +66,10 @@ enabled=1
 
 [updates-testing]
 name=updates-testing
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f25&arch=i386
-baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/i386
+#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/i386
 enabled=1
 
 [remi]
diff --git a/fc25i71.cfg b/fc25i71.cfg
index f7cba9d..fd2ba66 100644
--- a/fc25i71.cfg
+++ b/fc25i71.cfg
@@ -1,7 +1,9 @@
 config_opts['root'] = 'fc25i'
 config_opts['target_arch'] = 'i686'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
@@ -30,13 +32,15 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-debuglevel=1
+keepcache=1
+debuglevel=2
 reposdir=/dev/null
 logfile=/var/log/yum.log
 retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+metadata_expire=10
 fastestmirror=1
 max_parallel_downloads=6
 
@@ -44,13 +48,17 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=i386
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=i386
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/25/Everything/i386/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/25/Everything/i386/os/
 
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=i386
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=i386
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/25/i386/
 #	http://mirrors.ircam.fr/pub/fedora/linux/updates/25/i386/
 #	http://fr2.rpmfind.net/linux/fedora/updates/25/i386/
@@ -58,8 +66,10 @@ enabled=1
 
 [updates-testing]
 name=updates-testing
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f25&arch=i386
-baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/i386
+#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/i386
 enabled=1
 
 [remi]
diff --git a/fc25it.cfg b/fc25it.cfg
index 35032c2..96209aa 100644
--- a/fc25it.cfg
+++ b/fc25it.cfg
@@ -1,7 +1,9 @@
 config_opts['root'] = 'fc25i'
 config_opts['target_arch'] = 'i686'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
@@ -30,13 +32,15 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-debuglevel=1
+keepcache=1
+debuglevel=2
 reposdir=/dev/null
 logfile=/var/log/yum.log
 retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+metadata_expire=10
 fastestmirror=1
 max_parallel_downloads=6
 
@@ -44,13 +48,17 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=i386
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=i386
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/25/Everything/i386/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/25/Everything/i386/os/
 
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=i386
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=i386
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/25/i386/
 #	http://mirrors.ircam.fr/pub/fedora/linux/updates/25/i386/
 #	http://fr2.rpmfind.net/linux/fedora/updates/25/i386/
@@ -58,8 +66,10 @@ enabled=1
 
 [updates-testing]
 name=updates-testing
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f25&arch=i386
-baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/i386
+#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/i386
 enabled=1
 
 [remi]
diff --git a/fc25x.cfg b/fc25x.cfg
index 01e27ef..6ecc192 100644
--- a/fc25x.cfg
+++ b/fc25x.cfg
@@ -1,7 +1,9 @@
 config_opts['root'] = 'fc25x'
 config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
@@ -30,13 +32,15 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-debuglevel=1
+keepcache=1
+debuglevel=2
 reposdir=/dev/null
 logfile=/var/log/yum.log
 retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+metadata_expire=10
 fastestmirror=1
 max_parallel_downloads=6
 
@@ -44,13 +48,17 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/25/Everything/x86_64/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/25/Everything/x86_64/os/
 
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
 #	http://mirrors.ircam.fr/pub/fedora/linux/updates/25/x86_64/
 #	http://fr2.rpmfind.net/linux/fedora/updates/25/x86_64/
@@ -58,8 +66,10 @@ enabled=1
 	
 [updates-testing]
 name=updates-testing
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
-baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
+#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
 enabled=1
 
 [remi]
diff --git a/fc25x71.cfg b/fc25x71.cfg
index 6ac288a..9d33838 100644
--- a/fc25x71.cfg
+++ b/fc25x71.cfg
@@ -1,7 +1,9 @@
 config_opts['root'] = 'fc25x'
 config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
@@ -30,13 +32,15 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-debuglevel=1
+keepcache=1
+debuglevel=2
 reposdir=/dev/null
 logfile=/var/log/yum.log
 retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+metadata_expire=10
 fastestmirror=1
 max_parallel_downloads=6
 
@@ -44,19 +48,25 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/25/Everything/x86_64/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/25/Everything/x86_64/os/
 
 [updates-released]
 name=updates
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
-baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
+#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
 enabled=1
 	
 [updates-testing]
 name=updates-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f25&arch=x86_64
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
 enabled=0
 
diff --git a/fc25xscl54.cfg b/fc25xscl54.cfg
index 6381099..ed6f310 100644
--- a/fc25xscl54.cfg
+++ b/fc25xscl54.cfg
@@ -2,6 +2,8 @@ config_opts['root'] = 'scl54fc25x'
 config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php54-build php54-php-devel php54-php-pear'
 config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
@@ -33,13 +35,15 @@ config_opts['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
 [main]
-debuglevel=1
+keepcache=1
+debuglevel=2
 reposdir=/dev/null
 logfile=/var/log/yum.log
 retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+metadata_expire=10
 fastestmirror=1
 max_parallel_downloads=6
 
@@ -47,13 +51,17 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/25/Everything/x86_64/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/25/Everything/x86_64/os/
 
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
 #	http://mirrors.ircam.fr/pub/fedora/linux/updates/25/x86_64/
 #	http://fr2.rpmfind.net/linux/fedora/updates/25/x86_64/
@@ -61,8 +69,10 @@ enabled=1
 	
 [updates-testing]
 name=updates-testing
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
-baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
+#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
 enabled=1
 
 [remi]
diff --git a/fc25xscl55.cfg b/fc25xscl55.cfg
index 0fdc78e..f973339 100644
--- a/fc25xscl55.cfg
+++ b/fc25xscl55.cfg
@@ -2,6 +2,8 @@ config_opts['root'] = 'scl55fc25x'
 config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php55-build php55-php-devel php55-php-pear'
 config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
@@ -33,13 +35,15 @@ config_opts['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
 [main]
-debuglevel=1
+keepcache=1
+debuglevel=2
 reposdir=/dev/null
 logfile=/var/log/yum.log
 retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+metadata_expire=10
 fastestmirror=1
 max_parallel_downloads=6
 
@@ -47,13 +51,17 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/25/Everything/x86_64/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/25/Everything/x86_64/os/
 
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
 #	http://mirrors.ircam.fr/pub/fedora/linux/updates/25/x86_64/
 #	http://fr2.rpmfind.net/linux/fedora/updates/25/x86_64/
@@ -61,8 +69,10 @@ enabled=1
 	
 [updates-testing]
 name=updates-testing
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
-baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
+#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
 enabled=1
 
 [remi]
diff --git a/fc25xscl56.cfg b/fc25xscl56.cfg
index 4e22a24..89d6603 100644
--- a/fc25xscl56.cfg
+++ b/fc25xscl56.cfg
@@ -2,6 +2,8 @@ config_opts['root'] = 'scl56fc25x'
 config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php56-build php56-php-devel php56-php-pear'
 config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
@@ -33,13 +35,15 @@ config_opts['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
 [main]
-debuglevel=1
+keepcache=1
+debuglevel=2
 reposdir=/dev/null
 logfile=/var/log/yum.log
 retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+metadata_expire=10
 fastestmirror=1
 max_parallel_downloads=6
 
@@ -47,13 +51,17 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/25/Everything/x86_64/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/25/Everything/x86_64/os/
 
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
 #	http://mirrors.ircam.fr/pub/fedora/linux/updates/25/x86_64/
 #	http://fr2.rpmfind.net/linux/fedora/updates/25/x86_64/
@@ -61,8 +69,10 @@ enabled=1
 	
 [updates-testing]
 name=updates-testing
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
-baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
+#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
 enabled=1
 
 [remi]
diff --git a/fc25xscl70.cfg b/fc25xscl70.cfg
index 55ee5c8..72b3873 100644
--- a/fc25xscl70.cfg
+++ b/fc25xscl70.cfg
@@ -2,6 +2,8 @@ config_opts['root'] = 'scl70fc25x'
 config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php70-build'
 config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
@@ -33,13 +35,15 @@ config_opts['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
 [main]
-debuglevel=1
+keepcache=1
+debuglevel=2
 reposdir=/dev/null
 logfile=/var/log/yum.log
 retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+metadata_expire=10
 fastestmirror=1
 max_parallel_downloads=6
 
@@ -47,14 +51,18 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/25/Everything/x86_64/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/25/Everything/x86_64/os/
 exclude=*.i686
 
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
 #	http://mirrors.ircam.fr/pub/fedora/linux/updates/25/x86_64/
 #	http://fr2.rpmfind.net/linux/fedora/updates/25/x86_64/
@@ -63,7 +71,9 @@ exclude=*.i686
 
 [updates-testing]
 name=updates-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f25&arch=x86_64
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
 enabled=1
 
diff --git a/fc25xscl71.cfg b/fc25xscl71.cfg
index 9cd3068..ab5651b 100644
--- a/fc25xscl71.cfg
+++ b/fc25xscl71.cfg
@@ -2,6 +2,8 @@ config_opts['root'] = 'scl71fc25x'
 config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build'
 config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
@@ -33,13 +35,15 @@ config_opts['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
 [main]
-debuglevel=1
+keepcache=1
+debuglevel=2
 reposdir=/dev/null
 logfile=/var/log/yum.log
 retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+metadata_expire=10
 fastestmirror=1
 max_parallel_downloads=6
 
@@ -47,14 +51,18 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/25/Everything/x86_64/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/25/Everything/x86_64/os/
 exclude=*.i686
 
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
 #	http://mirrors.ircam.fr/pub/fedora/linux/updates/25/x86_64/
 #	http://fr2.rpmfind.net/linux/fedora/updates/25/x86_64/
@@ -63,8 +71,10 @@ exclude=*.i686
 
 [updates-testing]
 name=updates-testing
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
-baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
+#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
 enabled=1
 
 [remi]
diff --git a/fc25xt.cfg b/fc25xt.cfg
index 7949c8a..b933673 100644
--- a/fc25xt.cfg
+++ b/fc25xt.cfg
@@ -1,7 +1,9 @@
 config_opts['root'] = 'fc25x'
 config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
@@ -30,28 +32,33 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-debuglevel=1
+keepcache=1
+debuglevel=2
 reposdir=/dev/null
 logfile=/var/log/yum.log
 retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+metadata_expire=10
 fastestmirror=1
 max_parallel_downloads=6
-metadata_expire=10
 
 # repos
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-25&arch=x86_64
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/25/Everything/x86_64/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/25/Everything/x86_64/os/
 
 [updates-released]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
 #	http://mirrors.ircam.fr/pub/fedora/linux/updates/25/x86_64/
 #	http://fr2.rpmfind.net/linux/fedora/updates/25/x86_64/
@@ -59,8 +66,10 @@ enabled=1
 	
 [updates-testing]
 name=updates-testing
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f25&arch=x86_64
-baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
+#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/25/x86_64/
 enabled=1
 
 [remi]