[releng] buildbranched/rawhide: Introduce COMPSFILE

[Till Maas]

commit 38e63ee63937a7343e917aa344c6816e8e4e379f
Author: Till Maas <opensource(a)till.name&gt;
Date:   Tue Sep 30 22:00:02 2014 +0200

    buildbranched/rawhide: Introduce COMPSFILE

 scripts/buildbranched |   10 ++++++----
 scripts/buildrawhide  |   14 ++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/scripts/buildbranched b/scripts/buildbranched
index c034479..0c3b5a7 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -10,6 +10,7 @@ ARCH=$2
 
 BRANCHED="21"
 DIST=branched
+COMPSFILE="comps-f${BRANCHED}.xml"
 
 TREEPREFIX="/pub/fedora/linux"
 MASHDIR="/mnt/koji/mash/${DIST}-$DATE"
@@ -86,14 +87,14 @@ log "git clone of comps started"
 pushd $TMPDIR
 git clone git://git.fedorahosted.org/comps.git && {
     pushd comps
-    make comps-f$BRANCHED.xml
-    cp comps-f$BRANCHED.xml $logdir/
+    make "${COMPSFILE}"
+    cp "${COMPSFILE}" $logdir/
     popd
 }
 popd
 log "git clone of comps finished"
 
-[ -f $logdir/comps-f$BRANCHED.xml ] || exit 1
+[ -f "$logdir/${COMPSFILE}" ] || exit 1
 
 log "mock init"
 mock -r $MOCKCONFIG --uniqueext=$DATE --init
@@ -116,7 +117,8 @@ send_fedmsg start mash.start
 
 log "starting mash"
 # Drop privs here so that we run as the masher UID
-mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "mash $MASHOPTS -p
$TREEPREFIX/development/$BRANCHED -o ${MASHDIR} --compsfile $logdir/comps-f$BRANCHED.xml
$BRANCHED$EXPANDARCH > $logdir/mash.log 2>&1" || exit 1
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "mash $MASHOPTS -p
$TREEPREFIX/development/$BRANCHED -o ${MASHDIR} --compsfile
$logdir/"${COMPSFILE}" $BRANCHED$EXPANDARCH > $logdir/mash.log
2>&1" || exit 1
+    "mash $MASHOPTS -p $TREEPREFIX/development/$BRANCHED -o ${MASHDIR} --compsfile
$logdir/${COMPSFILE} $BRANCHED$EXPANDARCH > $logdir/mash.log 2>&1" || exit
1
 
 send_fedmsg done mash.complete
 
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index d3e4fad..50bfc00 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -10,6 +10,7 @@ ARCH=$2
 
 BRANCHED=rawhide
 DIST=rawhide
+COMPSFILE=comps-rawhide.xml
 
 TREEPREFIX="/pub/fedora/linux"
 MASHDIR="/mnt/koji/mash/${DIST}-$DATE"
@@ -86,14 +87,14 @@ log "git clone of comps started"
 pushd $TMPDIR
 git clone git://git.fedorahosted.org/comps.git && {
     pushd comps
-    make comps-rawhide
-    cp comps-rawhide.xml $logdir/
+    make "${COMPSFILE}"
+    cp "${COMPSFILE}" $logdir/
     popd
 }
 popd
 log "git clone of comps finished"
 
-[ -f $logdir/comps-rawhide.xml ] || exit 1
+[ -f "$logdir/${COMPSFILE}" ] || exit 1
 
 log "mock init"
 mock -r $MOCKCONFIG --uniqueext=$DATE --init
@@ -107,7 +108,8 @@ send_fedmsg start mash.start
 
 log "starting mash"
 # Drop privs here so that we run as the masher UID
-mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "mash $MASHOPTS -p
$TREEPREFIX/development/rawhide -o ${MASHDIR} --compsfile $logdir/comps-rawhide.xml
rawhide$EXPANDARCH > $logdir/mash.log 2>&1" || exit 1
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "mash $MASHOPTS -p
$TREEPREFIX/development/$BRANCHED -o ${MASHDIR} --compsfile
$logdir/"${COMPSFILE}" $BRANCHED$EXPANDARCH > $logdir/mash.log
2>&1" || exit 1
+    "mash $MASHOPTS -p $TREEPREFIX/development/$BRANCHED -o ${MASHDIR} --compsfile
$logdir/${COMPSFILE} $BRANCHED$EXPANDARCH > $logdir/mash.log 2>&1" || exit
1
 
 send_fedmsg done mash.complete
 
@@ -119,11 +121,11 @@ log "finished hardlink"
 
 log "starting repodiff"
 mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "rm -f /var/lib/rpm/__db*"
-mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "/usr/bin/repodiff -s -q
--new=file://${MASHDIR}/rawhide$EXPANDARCH/source/SRPMS
--old=file://$TREEPREFIX/development/rawhide/source/SRPMS > $logdir/repodiff"
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "/usr/bin/repodiff -s -q
--new=file://${MASHDIR}/$BRANCHED$EXPANDARCH/source/SRPMS
--old=file://$TREEPREFIX/development/$BRANCHED/source/SRPMS > $logdir/repodiff"
 log "finished repodiff"
 
 log "starting spam-o-matic"
-mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot
"/usr/share/mash/spam-o-matic $DEPOPTS ${MASHDIR}/rawhide$EXPANDARCH
>$logdir/depcheck" &
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot
"/usr/share/mash/spam-o-matic $DEPOPTS ${MASHDIR}/$BRANCHED$EXPANDARCH
>$logdir/depcheck" &
 log "finished spam-o-matic"
 
 send_fedmsg start pungify.start