summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-02-27 08:58:39 +0100
committerRemi Collet <remi@remirepo.net>2018-02-27 08:58:39 +0100
commit8d4fce012dcd8f220c9763d2620713dc205c5b56 (patch)
treeb3a7b651ec751125729669217a2fb2c7e35822e1
parent25b219521959a3b8ff0613334aa8ee1a01c5ceb9 (diff)
add f28 and drop f24 everywhere
-rw-r--r--buildfct102
-rwxr-xr-xgetmock31
2 files changed, 36 insertions, 97 deletions
diff --git a/buildfct b/buildfct
index c67d505..d276d6b 100644
--- a/buildfct
+++ b/buildfct
@@ -5,41 +5,18 @@ alias rhpkg='echo NO PLEASE, use fedpkg'
mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
-#alias mockfc22i=" setarch i686 mock --configdir=$mocketc -r fc22i --arch i686 rebuild "
-#alias mockfc22i70="setarch i686 mock --configdir=$mocketc -r fc22i70 --arch i686 rebuild "
-#alias mockfc22x=" mock --configdir=$mocketc -r fc22x rebuild "
-#alias mockfc22x70=" mock --configdir=$mocketc -r fc22x70 rebuild "
-#alias mockfc22xscl54=" mock --configdir=$mocketc -r fc22xscl54 rebuild "
-#alias mockfc22xscl55=" mock --configdir=$mocketc -r fc22xscl55 rebuild "
-#alias mockfc22xscl56=" mock --configdir=$mocketc -r fc22xscl56 rebuild "
-#alias mockfc22xscl70=" mock --configdir=$mocketc -r fc22xscl70 rebuild "
-#alias mockfc22xscl71=" mock --configdir=$mocketc -r fc22xscl71 rebuild "
-
-#alias mockfc23i=" setarch i686 mock --configdir=$mocketc -r fc23i --arch i686 rebuild "
-#alias mockfc23i70="setarch i686 mock --configdir=$mocketc -r fc23i70 --arch i686 rebuild "
-#alias mockfc23i71="setarch i686 mock --configdir=$mocketc -r fc23i71 --arch i686 rebuild "
-#alias mockfc23x=" mock --configdir=$mocketc -r fc23x rebuild "
-#alias mockfc23x70=" mock --configdir=$mocketc -r fc23x70 rebuild "
-#alias mockfc23d70=" mock --configdir=$mocketc -r fc23d70 rebuild "
-#alias mockfc23x71=" mock --configdir=$mocketc -r fc23x71 rebuild "
-#alias mockfc23xscl54=" mock --configdir=$mocketc -r fc23xscl54 rebuild "
-#alias mockfc23xscl55=" mock --configdir=$mocketc -r fc23xscl55 rebuild "
-#alias mockfc23xscl56=" mock --configdir=$mocketc -r fc23xscl56 rebuild "
-#alias mockfc23xscl70=" mock --configdir=$mocketc -r fc23xscl70 rebuild "
-#alias mockfc23xscl71=" mock --configdir=$mocketc -r fc23xscl71 rebuild "
-
-alias mockfc24i=" setarch i686 mock --configdir=$mocketc -r fc24i --arch i686 rebuild "
-alias mockfc24i70="setarch i686 mock --configdir=$mocketc -r fc24i70 --arch i686 rebuild "
-alias mockfc24i71="setarch i686 mock --configdir=$mocketc -r fc24i71 --arch i686 rebuild "
-alias mockfc24x=" mock --configdir=$mocketc -r fc24x rebuild "
-alias mockfc24x70=" mock --configdir=$mocketc -r fc24x70 rebuild "
-alias mockfc24x71=" mock --configdir=$mocketc -r fc24x71 rebuild "
-alias mockfc24xscl54=" mock --configdir=$mocketc -r fc24xscl54 rebuild "
-alias mockfc24xscl55=" mock --configdir=$mocketc -r fc24xscl55 rebuild "
-alias mockfc24xscl56=" mock --configdir=$mocketc -r fc24xscl56 rebuild "
-alias mockfc24xscl70=" mock --configdir=$mocketc -r fc24xscl70 rebuild "
-alias mockfc24xscl71=" mock --configdir=$mocketc -r fc24xscl71 rebuild "
-alias mockfc24xscl72=" mock --configdir=$mocketc -r fc24xscl72 rebuild "
+#alias mockfc24i=" setarch i686 mock --configdir=$mocketc -r fc24i --arch i686 rebuild "
+#alias mockfc24i70="setarch i686 mock --configdir=$mocketc -r fc24i70 --arch i686 rebuild "
+#alias mockfc24i71="setarch i686 mock --configdir=$mocketc -r fc24i71 --arch i686 rebuild "
+#alias mockfc24x=" mock --configdir=$mocketc -r fc24x rebuild "
+#alias mockfc24x70=" mock --configdir=$mocketc -r fc24x70 rebuild "
+#alias mockfc24x71=" mock --configdir=$mocketc -r fc24x71 rebuild "
+#alias mockfc24xscl54=" mock --configdir=$mocketc -r fc24xscl54 rebuild "
+#alias mockfc24xscl55=" mock --configdir=$mocketc -r fc24xscl55 rebuild "
+#alias mockfc24xscl56=" mock --configdir=$mocketc -r fc24xscl56 rebuild "
+#alias mockfc24xscl70=" mock --configdir=$mocketc -r fc24xscl70 rebuild "
+#alias mockfc24xscl71=" mock --configdir=$mocketc -r fc24xscl71 rebuild "
+#alias mockfc24xscl72=" mock --configdir=$mocketc -r fc24xscl72 rebuild "
alias mockfc25i=" setarch i686 mock --configdir=$mocketc -r fc25i --arch i686 rebuild "
alias mockfc25i71="setarch i686 mock --configdir=$mocketc -r fc25i71 --arch i686 rebuild "
@@ -146,7 +123,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 27 26 25 24
+ for i in 28 27 26 25
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 !"
@@ -189,11 +166,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 24
- 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 !"
- done
echo -n "$(date +%X) el6 "
setarch i686 mock $quiet --configdir=$mocketc -r el6i --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
date +%X
@@ -266,8 +238,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) 70 fc24 "
- setarch i686 mock $quiet --configdir=$mocketc -r fc24i70 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
echo -n "$(date +%X) 70 el6 "
setarch i686 mock $quiet --configdir=$mocketc -r el6i70 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
date +%X
@@ -288,8 +258,6 @@ fi
if [ -f "$1" ]; then
echo -n "$(date +%X) 71 fc25 "
setarch i686 mock $quiet --configdir=$mocketc -r fc25i71 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) 71 fc24 "
- setarch i686 mock $quiet --configdir=$mocketc -r fc24i71 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
echo -n "$(date +%X) 71 el6 "
setarch i686 mock $quiet --configdir=$mocketc -r el6i71 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
date +%X
@@ -332,7 +300,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 24
+ for i in 25
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 !"
@@ -355,7 +323,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 27 26 25 24
+ for i in 28 27 26 25
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -402,11 +370,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 24
- do
- echo -n "$(date +%X) fc$i "
- mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
- done
for i in 7 6
do
echo -n "$(date +%X) el$i "
@@ -450,7 +413,7 @@ fi
if [ -f "$1" ]; then
date +%X
pids=""
- for i in 27 26 25 24
+ for i in 28 27 26 25
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (56) fc$i Ok." || echo "fc$1 Error !")&
@@ -480,18 +443,12 @@ fi
if [ -f "$1" ]; then
date +%X
pids=""
- for i in 27 26 25
+ for i in 28 27 26 25
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")&
pids="$pids $!"
done
- for i in 24
- do
- echo -n ""
- (mock $quiet --configdir=$mocketc -r fc${i}x70 rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")&
- pids="$pids $!"
- done
for i in 7 6
do
echo -n ""
@@ -516,13 +473,13 @@ fi
if [ -f "$1" ]; then
date +%X
pids=""
- for i in 27 26
+ for i in 28 27 26
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")&
pids="$pids $!"
done
- for i in 25 24
+ for i in 25
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x71 rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")&
@@ -593,11 +550,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 24
- do
- echo -n "$(date +%X) 70 fc$i "
- mock $quiet --configdir=$mocketc -r fc${i}x70 rebuild $1 && echo " Ok." || echo " Error !"
- done
for i in 7 6
do
echo -n "$(date +%X) 70 el$i "
@@ -619,7 +571,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 24
+ for i in 25
do
echo -n "$(date +%X) 71 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -671,7 +623,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 27 26 24 25
+ for i in 27 28 26 25
do
echo -n "$(date +%X) scl72 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -697,7 +649,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 27 26 25 24
+ for i in 27 28 26 25
do
echo -n "$(date +%X) scl71 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -723,7 +675,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 27 26 25 24
+ for i in 27 28 26 25
do
echo -n "$(date +%X) scl70 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -749,7 +701,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 27 26 25 24
+ for i in 27 28 26 25
do
echo -n "$(date +%X) scl56 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
@@ -775,7 +727,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 24
+ for i in 25
do
echo -n "$(date +%X) scl55 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl55 rebuild $1 && echo " Ok." || echo " Error !"
@@ -801,7 +753,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 24
+ for i in 25
do
echo -n "$(date +%X) scl54 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl54 rebuild $1 && echo " Ok." || echo " Error !"
@@ -827,7 +779,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 24
+ for i in 25
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/getmock b/getmock
index ca5af9e..d82f072 100755
--- a/getmock
+++ b/getmock
@@ -197,7 +197,7 @@ if [ $1 = devs -o $1 = dev ]; then
fi
if [ $1 = all ]; then
- for i in 24 25 26 27 28
+ for i in 25 26 27 28
do
getOneMock fc${i}i $opt
done
@@ -226,11 +226,6 @@ elif [ $1 = all56 ]; then
elif [ $1 = all70 ]; then
[ $opt = remi ] && opt=php70
[ $opt = test ] && opt=test70
- for n in 24
- do
- getOneMock fc${n}i $opt '*7.0*'
- getOneMock fc${n}x $opt '*7.0*'
- done
n=6
getOneMock el${n}i $opt '*7.0*'
getOneMock el${n}x $opt '*7.0*'
@@ -240,7 +235,7 @@ elif [ $1 = all70 ]; then
elif [ $1 = all71 ]; then
[ $opt = remi ] && opt=php71
[ $opt = test ] && opt=test71
- for n in 24 25
+ for n in 25
do
getOneMock fc${n}i $opt '*7.1*'
getOneMock fc${n}x $opt '*7.1*'
@@ -275,27 +270,19 @@ elif [ $1 = all54 ]; then
getOneMock el${n}x remi '*5.4*'
elif [ $1 = for56 ]; then
- for i in 24
- do
- getOneMock fc${i}x remi
- done
for i in 6 7
do
getOneMock el${i}x test
done
elif [ $1 = for55 ]; then
- for i in 24
- do
- getOneMock fc${i}x remi
- done
for i in 6 7
do
getOneMock el${i}x test
done
elif [ $1 = allx ]; then
- for i in 24 25 26 27 28
+ for i in 25 26 27 28
do
getOneMock fc${i}x $opt
done
@@ -305,7 +292,7 @@ elif [ $1 = allx ]; then
done
elif [ $1 = scl54 ]; then
- for i in 24 25
+ for i in 25
do
getOneMock scl54fc${i}x $opt
done
@@ -315,7 +302,7 @@ elif [ $1 = scl54 ]; then
done
elif [ $1 = scl55 ]; then
- for i in 24 25
+ for i in 25
do
getOneMock scl55fc${i}x $opt
done
@@ -325,7 +312,7 @@ elif [ $1 = scl55 ]; then
done
elif [ $1 = scl56 ]; then
- for i in 24 25 26 27
+ for i in 25 26 27 28
do
getOneMock scl56fc${i}x $opt
done
@@ -335,7 +322,7 @@ elif [ $1 = scl56 ]; then
done
elif [ $1 = scl70 ]; then
- for i in 24 25 26 27
+ for i in 25 26 27 28
do
getOneMock scl70fc${i}x $opt
done
@@ -345,7 +332,7 @@ elif [ $1 = scl70 ]; then
done
elif [ $1 = scl71 ]; then
- for i in 24 25 26 27
+ for i in 25 26 27 28
do
getOneMock scl71fc${i}x $opt
done
@@ -355,7 +342,7 @@ elif [ $1 = scl71 ]; then
done
elif [ $1 = scl72 ]; then
- for i in 24 25 26 27
+ for i in 25 26 27 28
do
getOneMock scl72fc${i}x $opt
done