mock: ensure fc25 uses dnf cache

12 files changed, 10 insertions, 21 deletions

diff --git a/buildfct b/buildfct
index 12d0a33..498e452 100644
--- a/buildfct
+++ b/buildfct
@@ -110,7 +110,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 24 25 22
+  for i in 25 24 23 22
   do
     echo -n "$(date +%X) fc$i "
     setarch i686  mock $quiet --configdir=$mocketc -r fc${i}i --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -243,7 +243,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 22 24 25
+  for i in 25 23 22 24
   do
     echo -n "$(date +%X) test-fc$i "
     setarch i686  mock $quiet --configdir=$mocketc -r fc${i}it  --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -268,7 +268,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 24 25 22
+  for i in 25 23 24 22
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -414,7 +414,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 24 25
+  for i in 25 24 23
   do
     echo -n "$(date +%X) 71 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -440,7 +440,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 24 25 22
+  for i in 25 24 23 22
   do
     echo -n "$(date +%X) scl71 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -466,7 +466,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 24 22 25
+  for i in 25 24 22 23
   do
     echo -n "$(date +%X) scl70 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -492,7 +492,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 25 24 22
+  for i in 25 23 24 22
   do
     echo -n "$(date +%X) scl56 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
@@ -518,7 +518,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 25 24 22
+  for i in 25 23 24 22
   do
     echo -n "$(date +%X) scl55 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl55 rebuild $1 && echo " Ok." || echo " Error !"
@@ -544,7 +544,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 24 22 25
+  for i in 25 24 22 23
   do
     echo -n "$(date +%X) scl54 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl54 rebuild $1 && echo " Ok." || echo " Error !"
@@ -570,7 +570,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 22 24 25
+  for i in 25 22 24 23
   do
     echo -n "$(date +%X) test-fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xt rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/mock/fc25i.cfg b/mock/fc25i.cfg
index c531160..b36fea5 100644
--- a/mock/fc25i.cfg
+++ b/mock/fc25i.cfg
@@ -30,7 +30,6 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-cachedir=/var/cache/yum
 debuglevel=1
 reposdir=/dev/null
 logfile=/var/log/yum.log
diff --git a/mock/fc25i71.cfg b/mock/fc25i71.cfg
index 1d5d679..c2c497f 100644
--- a/mock/fc25i71.cfg
+++ b/mock/fc25i71.cfg
@@ -30,7 +30,6 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-cachedir=/var/cache/yum
 debuglevel=1
 reposdir=/dev/null
 logfile=/var/log/yum.log
diff --git a/mock/fc25it.cfg b/mock/fc25it.cfg
index 5362736..e3c1de0 100644
--- a/mock/fc25it.cfg
+++ b/mock/fc25it.cfg
@@ -30,7 +30,6 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-cachedir=/var/cache/yum
 debuglevel=1
 reposdir=/dev/null
 logfile=/var/log/yum.log
diff --git a/mock/fc25x.cfg b/mock/fc25x.cfg
index 2fdb10d..1ab4a24 100644
--- a/mock/fc25x.cfg
+++ b/mock/fc25x.cfg
@@ -30,7 +30,6 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-cachedir=/var/cache/yum
 debuglevel=1
 reposdir=/dev/null
 logfile=/var/log/yum.log
diff --git a/mock/fc25x71.cfg b/mock/fc25x71.cfg
index 55ae05d..2213f1c 100644
--- a/mock/fc25x71.cfg
+++ b/mock/fc25x71.cfg
@@ -30,7 +30,6 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-cachedir=/var/cache/yum
 debuglevel=1
 reposdir=/dev/null
 logfile=/var/log/yum.log
diff --git a/mock/fc25xscl54.cfg b/mock/fc25xscl54.cfg
index f3f554e..6d9e3a5 100644
--- a/mock/fc25xscl54.cfg
+++ b/mock/fc25xscl54.cfg
@@ -33,7 +33,6 @@ config_opts['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
 [main]
-cachedir=/var/cache/yum
 debuglevel=1
 reposdir=/dev/null
 logfile=/var/log/yum.log
diff --git a/mock/fc25xscl55.cfg b/mock/fc25xscl55.cfg
index 08ce3af..d301a34 100644
--- a/mock/fc25xscl55.cfg
+++ b/mock/fc25xscl55.cfg
@@ -33,7 +33,6 @@ config_opts['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
 [main]
-cachedir=/var/cache/yum
 debuglevel=1
 reposdir=/dev/null
 logfile=/var/log/yum.log
diff --git a/mock/fc25xscl56.cfg b/mock/fc25xscl56.cfg
index f907800..8bbdf78 100644
--- a/mock/fc25xscl56.cfg
+++ b/mock/fc25xscl56.cfg
@@ -33,7 +33,6 @@ config_opts['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
 [main]
-cachedir=/var/cache/yum
 debuglevel=1
 reposdir=/dev/null
 logfile=/var/log/yum.log
diff --git a/mock/fc25xscl70.cfg b/mock/fc25xscl70.cfg
index e4a5d9a..3887185 100644
--- a/mock/fc25xscl70.cfg
+++ b/mock/fc25xscl70.cfg
@@ -33,7 +33,6 @@ config_opts['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
 [main]
-cachedir=/var/cache/yum
 debuglevel=1
 reposdir=/dev/null
 logfile=/var/log/yum.log
diff --git a/mock/fc25xscl71.cfg b/mock/fc25xscl71.cfg
index 17a1ad2..162d20a 100644
--- a/mock/fc25xscl71.cfg
+++ b/mock/fc25xscl71.cfg
@@ -33,7 +33,6 @@ config_opts['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
 [main]
-cachedir=/var/cache/yum
 debuglevel=1
 reposdir=/dev/null
 logfile=/var/log/yum.log
diff --git a/mock/fc25xt.cfg b/mock/fc25xt.cfg
index 056027d..06dc361 100644
--- a/mock/fc25xt.cfg
+++ b/mock/fc25xt.cfg
@@ -30,7 +30,6 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['yum.conf'] = """
 [main]
-cachedir=/var/cache/yum
 debuglevel=1
 reposdir=/dev/null
 logfile=/var/log/yum.log