summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Keating <jkeating@redhat.com>2008-08-19 14:25:59 -0400
committerJesse Keating <jkeating@redhat.com>2008-08-19 14:25:59 -0400
commit94b49045c7caca170ef8a2f73c8ec1be94d755cc (patch)
tree1968c50f3b8d0b0d2df827afd55f5c88b73cc08d
parent440bb1b9b23aa82035b49f05cbe794ccaf7add25 (diff)
downloadreleng-94b49045c7caca170ef8a2f73c8ec1be94d755cc.tar.gz
releng-94b49045c7caca170ef8a2f73c8ec1be94d755cc.tar.xz
releng-94b49045c7caca170ef8a2f73c8ec1be94d755cc.zip
Make the mock config used for rawhide production a variable
-rwxr-xr-xscripts/buildrawhide13
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index 7e168bc..3d3a4eb 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -5,6 +5,7 @@
DATE=$1
RSYNC_OPTS="-rlptDHhv --delay-updates"
DESTPATH="/pub/fedora/linux/development/"
+MOCKCONFIG=fedora-rawhide-compose-i386
[ -z "$DATE" ] && {
@@ -25,16 +26,16 @@ cvs -d :pserver:anonymous@cvs.fedora.redhat.com:/cvs/pkgs -z3 -q co comps && {
}
popd
-mock -r fedora-rawhide-x86_64 --init
-mock -r fedora-rawhide-x86_64 --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview
-mock -r fedora-rawhide-x86_64 --shell "mash -o /mnt/koji/mash/rawhide-$DATE --compsfile /mnt/koji/mash/rawhide-$DATE/logs/comps-rawhide.xml development > /mnt/koji/mash/rawhide-$DATE/logs/mash.log 2>&1" || exit 1
+mock -r $MOCKCONFIG --init
+mock -r $MOCKCONFIG --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview
+mock -r $MOCKCONFIG --shell "mash -o /mnt/koji/mash/rawhide-$DATE --compsfile /mnt/koji/mash/rawhide-$DATE/logs/comps-rawhide.xml development > /mnt/koji/mash/rawhide-$DATE/logs/mash.log 2>&1" || exit 1
if [ -n "\$OLD" ]
then
- mock -r fedora-rawhide-x86_64 --shell "/usr/bin/repodiff -q --new=file:///mnt/koji/mash/rawhide-$DATE/development/source/SRPMS --old=file://\$OLD/development/source/SRPMS > /mnt/koji/mash/rawhide-$DATE/logs/repodiff"
+ mock -r $MOCKCONFIG --shell "/usr/bin/repodiff -q --new=file:///mnt/koji/mash/rawhide-$DATE/development/source/SRPMS --old=file://\$OLD/development/source/SRPMS > /mnt/koji/mash/rawhide-$DATE/logs/repodiff"
fi
-mock -r fedora-rawhide-x86_64 --shell "/usr/share/mash/spam-o-matic /mnt/koji/mash/rawhide-$DATE/development >/mnt/koji/mash/rawhide-$DATE/logs/depcheck" &
+mock -r $MOCKCONFIG --shell "/usr/share/mash/spam-o-matic /mnt/koji/mash/rawhide-$DATE/development >/mnt/koji/mash/rawhide-$DATE/logs/depcheck" &
for arch in i386 x86_64 ppc ; do
HOST=$(koji list-hosts --quiet --enabled --ready --arch=$arch | sed 's|/| |g' | sort -gn -k4 -k5r | awk -F '.' '{ print $1 ; exit }')
@@ -42,7 +43,7 @@ for arch in i386 x86_64 ppc ; do
done
wait
-mock -r fedora-rawhide-x86_64 --clean
+mock -r $MOCKCONFIG --clean
[ -n "$NOSYNC" ] && exit $rc
cd /tmp