[releng] Sync buildbranched and buildrawhide a little
by Till Maas
commit f300a5dcd6a0d515299cb59540b84a10abebfdac
Author: Till Maas <opensource(a)till.name>
Date: Mon Sep 29 20:44:53 2014 +0200
Sync buildbranched and buildrawhide a little
scripts/buildbranched | 84 ++++++++++++++++++++++++++++++++++++-------------
scripts/buildrawhide | 17 +++++-----
2 files changed, 70 insertions(+), 31 deletions(-)
---
diff --git a/scripts/buildbranched b/scripts/buildbranched
index 7b52c60..375f020 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -40,17 +40,31 @@ MOCKCONFIG=fedora-branched-compose-ppc64
RSYNC_OPTS="-rlptDHhv --delay-updates"
DESTPATH="$TREEPREFIX/development/$BRANCHED/"
-
+# basepath of $0
+scriptname="${0##*/}
[ -z "$DATE" ] && {
- echo "usage: buildbranched <date>"
+ echo "usage: ${scriptname} <date>"
exit 1
}
-TMPDIR=`mktemp -d /tmp/branched.$DATE.XXXX`
-mkdir -p /mnt/koji/mash/branched-$DATE/logs
-echo "Compose started at `date --utc`" > /mnt/koji/mash/branched-$DATE/logs/start
-echo >> /mnt/koji/mash/branched-$DATE/logs/start
+TMPDIR=`mktemp -d /tmp/${DIST}.$DATE.XXXX`
+logdir="/mnt/koji/mash/${DIST}-$DATE/logs"
+mkdir -p "${logdir}"
+
+
+echo "Compose started at $(date --utc)" > "$logdir/start"
+
+
+logfile="${logdir}/build${DIST}.log"
+touch "${logfile}"
+function log()
+{
+ message="${1}"
+ echo "$(date --utc) build${DIST}: ${message}" >> "${logfile}"
+}
+
+log "started"
# Emit a message using bodhi's cert (since we should be running as "masher").
echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
--cert-prefix bodhi \
@@ -58,16 +72,18 @@ echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fe
--topic branched.start \
--json-input
+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 /mnt/koji/mash/branched-$DATE/logs/
+ cp comps-f$BRANCHED.xml $logdir/
popd
}
popd
+log "git clone of comps finished"
-[ -f /mnt/koji/mash/branched-$DATE/logs/comps-f$BRANCHED.xml ] || exit 1
+[ -f $logdir/comps-f$BRANCHED.xml ] || exit 1
mock -r $MOCKCONFIG --uniqueext=$DATE --init
mock -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview hardlink
@@ -81,6 +97,7 @@ mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "sed -i -e 's|strict_keys = True|
}
# Copy in the hosts file so that we get the right address for koji
+log "mock setup /etc/hosts"
mock -r $MOCKCONFIG --uniqueext=$DATE --copyin /etc/hosts /etc/hosts >/dev/null 2>&1 # this reports to fail, but actually works
# Emit a message using bodhi's cert (since we should be running as "masher").
@@ -90,8 +107,9 @@ echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fe
--topic branched.mash.start \
--json-input
+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 /mnt/koji/mash/branched-$DATE --compsfile /mnt/koji/mash/branched-$DATE/logs/comps-f$BRANCHED.xml $BRANCHED$EXPANDARCH > /mnt/koji/mash/branched-$DATE/logs/mash.log 2>&1" || exit 1
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "mash $MASHOPTS -p $TREEPREFIX/development/$BRANCHED -o /mnt/koji/mash/branched-$DATE --compsfile $logdir/comps-f$BRANCHED.xml $BRANCHED$EXPANDARCH > $logdir/mash.log 2>&1" || exit 1
# Emit a message using bodhi's cert (since we should be running as "masher").
echo "{\"log\": \"done\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
@@ -100,13 +118,17 @@ echo "{\"log\": \"done\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fed
--topic branched.mash.complete \
--json-input
+log "finished mash"
+log "starting hardlink"
# hardlink the noarch deltarpms between x86_64 and i386
mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "hardlink -v -c /mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH"
+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:///mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH/source/SRPMS --old=file://$TREEPREFIX/development/$BRANCHED/source/SRPMS > /mnt/koji/mash/branched-$DATE/logs/repodiff"
-
-mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "/usr/share/mash/spam-o-matic $DEPOPTS /mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH >/mnt/koji/mash/branched-$DATE/logs/depcheck" &
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "/usr/bin/repodiff -s -q --new=file:///mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH/source/SRPMS --old=file://$TREEPREFIX/development/$BRANCHED/source/SRPMS > $logdir/repodiff"
+log "finished repodiff"
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "/usr/share/mash/spam-o-matic $DEPOPTS /mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH >$logdir/depcheck" &
# Emit a message using bodhi's cert (since we should be running as "masher").
@@ -116,16 +138,20 @@ echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fe
--topic branched.pungify.start \
--json-input
+log "starting critppath generation"
#only run critpath on primary arch
[ -z "$ARCH" ] && {
-./scripts/critpath.py --url file:///mnt/koji/mash/branched-$DATE/ -o /mnt/koji/mash/branched-$DATE/logs/critpath.txt branched &> /mnt/koji/mash/branched-$DATE/logs/critpath.log
+./scripts/critpath.py --url file:///mnt/koji/mash/$DIST-$DATE/$BRANCHED/ -o /mnt/koji/mash/$DIST-$DATE/logs/critpath.txt branched &> /mnt/koji/mash/$DIST-$DATE/logs/critpath.log
+log "finished critppath generation"
+log "starting pungify"
for basearch in armhfp i386 x86_64 ; do
HOST=$(koji list-hosts --quiet --enabled --ready --arch=$basearch --channel compose | sed 's|/| |g' | sort -g -k4 -k5r | awk -F ' ' '{ print $1 ; exit }')
- ./scripts/pungify $DATE $BRANCHED $basearch $HOST $DIST > /mnt/koji/mash/branched-$DATE/logs/pungify-$basearch.log 2>&1 &
+ ./scripts/pungify $DATE $BRANCHED $basearch $HOST $DIST > $logdir/pungify-$basearch.log 2>&1 &
done
}
wait
+log "finished pungify"
# Emit a message using bodhi's cert (since we should be running as "masher").
echo "{\"log\": \"done\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
@@ -134,19 +160,26 @@ echo "{\"log\": \"done\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fed
--topic branched.pungify.complete \
--json-input
+log "starting build_composeinfo"
echo "Running build_composeinfo"
-./scripts/build_composeinfo --name Fedora-${BRANCHED}-${DATE} /mnt/koji/mash/branched-$DATE/$BRANCHED/
+./scripts/build_composeinfo --name Fedora-${BRANCHED}-${DATE} /mnt/koji/mash/$DIST-$DATE/$BRANCHED/
+log "finished build_composeinfo"
+log "starting mock clean"
mock -r $MOCKCONFIG --uniqueext=$DATE --clean
+log "finished mock clean"
[ -n "$NOSYNC" ] && exit $rc
-# Create a branched link in /mnt/koji/mash, deltas et al depend on this
-rm /mnt/koji/mash/branched
-ln -s /mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH/ /mnt/koji/mash/branched
+log "started linking finished tree"
+# Create a rawhide link in /mnt/koji/mash, deltas et al depend on this
+rm /mnt/koji/mash/$DIST
+ln -s /mnt/koji/mash/$DIST-$DATE/$BRANCHED$EXPANDARCH/ /mnt/koji/mash/$DIST
+log "finished linking finished tree"
-echo "Compose finished at `date --utc`" > /mnt/koji/mash/branched-$DATE/logs/finish
-echo >> /mnt/koji/mash/branched-$DATE/logs/finish
+echo "Compose finished at $(date --utc)" >> $logdir/finish
+echo >> $logdir/finish
+log "finished compose"
# Emit a message using bodhi's cert (since we should be running as "masher").
echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
@@ -171,9 +204,11 @@ echo "{\"log\": \"done\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fed
--topic branched.rsync.complete \
--json-input
+log "starting sending email report"
if [ "$mail" = "0" ]; then
- cat /mnt/koji/mash/branched-$DATE/logs/start /mnt/koji/mash/branched-$DATE/logs/depcheck /mnt/koji/mash/branched-$DATE/logs/repodiff /mnt/koji/mash/branched-$DATE/logs/finish | mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $MAIL
+ cat $logdir/start $logdir/depcheck $logdir/repodiff $logdir/finish | mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $MAIL
fi
+log "finished sending email report"
[ -z "$ARCH" ] && {
# Emit a message using bodhi's cert (since we should be running as "masher").
@@ -183,13 +218,17 @@ echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fe
--topic branched.image.start \
--json-input
+log "started checking out spin-kickstarts"
pushd ../
git clone git://git.fedorahosted.org/git/spin-kickstarts/
pushd spin-kickstarts
git checkout f$BRANCHED
+log "finished checking out spin-kickstarts"
+log "started building live/arm/cloud images"
../releng/scripts/build-livecds $BRANCHED $DATE $BRANCHED
../releng/scripts/build-arm-images $BRANCHED $DATE $BRANCHED
../releng/scripts/build-cloud-images $BRANCHED $DATE $BRANCHED
+log "finished starting building live/arm/cloud images"
popd
popd
@@ -200,6 +239,7 @@ echo "{\"log\": \"done\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fed
--topic branched.image.complete \
--json-input
}
+
for koji in arm ppc s390
do
if [ "$koji" = "arm" ]; then
@@ -209,7 +249,7 @@ do
elif [ "$koji" = "s390" ]; then
arches=s390,s390x
fi
- scripts/srpm-excluded-arch.py -a $arches --path /mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH/source/SRPMS/*/ >/mnt/koji/mash/branched-$DATE/logs/excludearch-$koji.log
+ scripts/srpm-excluded-arch.py -a $arches --path /mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH/source/SRPMS/*/ >$logdir/excludearch-$koji.log
done
# Emit a message using bodhi's cert (since we should be running as "masher").
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index db902e9..e9124a9 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -105,7 +105,7 @@ log "starting mash"
mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "mash $MASHOPTS -p $TREEPREFIX/development/rawhide -o /mnt/koji/mash/rawhide-$DATE --compsfile $logdir/comps-rawhide.xml rawhide$EXPANDARCH > $logdir/mash.log 2>&1" || exit 1
# Emit a message using bodhi's cert (since we should be running as "masher").
-echo "{\"log\": \"done\", \"branch\": \"rawhide\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
+echo "{\"log\": \"done\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
--cert-prefix bodhi \
--modname compose \
--topic rawhide.mash.complete \
@@ -142,7 +142,7 @@ log "finished critppath generation"
log "starting pungify"
for basearch in armhfp i386 x86_64 ; do
HOST=$(koji list-hosts --quiet --enabled --ready --arch=$basearch --channel compose | sed 's|/| |g' | sort -g -k4 -k5r | awk -F ' ' '{ print $1 ; exit }')
- ./scripts/pungify $DATE $BRANCHED $basearch $HOST $DIST > /mnt/koji/mash/$DIST-$DATE/logs/pungify-$basearch.log 2>&1 &
+ ./scripts/pungify $DATE $BRANCHED $basearch $HOST $DIST > $logdir/pungify-$basearch.log 2>&1 &
done
}
wait
@@ -178,7 +178,7 @@ echo >> $logdir/finish
log "finished compose"
# Emit a message using bodhi's cert (since we should be running as "masher").
-echo "{\"log\": \"start\", \"branch\": \"rawhide\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
+echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
--cert-prefix bodhi \
--modname compose \
--topic rawhide.rsync.start \
@@ -196,19 +196,19 @@ if [ "$?" = "0" ]; then
fi
# Emit a message using bodhi's cert (since we should be running as "masher").
-echo "{\"log\": \"done\", \"branch\": \"rawhide\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
+echo "{\"log\": \"done\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
--cert-prefix bodhi \
--modname compose \
--topic rawhide.rsync.complete \
--json-input
-log "starting sending rawhide email report"
+log "starting sending email report"
if [ "$mail" = "0" ]; then
for tomail in "$(echo $TOMAIL)" ; do
cat $logdir/start $logdir/depcheck $logdir/repodiff $logdir/finish | mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
done
fi
-log "finished sending rawhide email report"
+log "finished sending email report"
[ -z "$ARCH" ] && {
# Emit a message using bodhi's cert (since we should be running as "masher").
@@ -249,12 +249,11 @@ do
elif [ "$koji" = "s390" ]; then
arches=s390,s390x
fi
- scripts/srpm-excluded-arch.py -a $arches --path /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/source/SRPMS/*/ >$logdir/excludearch-$koji.log
+ scripts/srpm-excluded-arch.py -a $arches --path /mnt/koji/mash/rawhide-$DATE/$BRANCHED$EXPANDARCH/source/SRPMS/*/ >$logdir/excludearch-$koji.log
done
-
# Emit a message using bodhi's cert (since we should be running as "masher").
-echo "{\"log\": \"done\", \"branch\": \"rawhide\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
+echo "{\"log\": \"done\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
--cert-prefix bodhi \
--modname compose \
--topic rawhide.complete \
9 years, 7 months
[releng] buildrawhide: Use $DIST for logging
by Till Maas
commit 2593908abd642f386fd55cd1231cb24a1f0c866d
Author: Till Maas <opensource(a)till.name>
Date: Mon Sep 29 20:24:17 2014 +0200
buildrawhide: Use $DIST for logging
scripts/buildrawhide | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index ef0f955..db902e9 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -47,8 +47,8 @@ scriptname="${0##*/}
exit 1
}
-TMPDIR=`mktemp -d /tmp/rawhide.$DATE.XXXX`
-logdir="/mnt/koji/mash/rawhide-$DATE/logs"
+TMPDIR=`mktemp -d /tmp/${DIST}.$DATE.XXXX`
+logdir="/mnt/koji/mash/${DIST}-$DATE/logs"
mkdir -p "${logdir}"
@@ -56,12 +56,12 @@ echo "Compose started at $(date --utc)" > "$logdir/start"
-logfile="${logdir}/buildrawhide.log"
+logfile="${logdir}/build${DIST}.log"
touch "${logfile}"
function log()
{
message="${1}"
- echo "$(date --utc) buildrawhide: ${message}" >> "${logfile}"
+ echo "$(date --utc) build${DIST}: ${message}" >> "${logfile}"
}
log "started"
9 years, 7 months
[releng] buildrawhide: Make USAGE generic
by Till Maas
commit 74c4e03630080818c639025a835ca7591eafaf8e
Author: Till Maas <opensource(a)till.name>
Date: Mon Sep 29 20:23:18 2014 +0200
buildrawhide: Make USAGE generic
scripts/buildrawhide | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index bc23fca..ef0f955 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -40,9 +40,10 @@ MOCKCONFIG=fedora-rawhide-compose-ppc64
RSYNC_OPTS="-rlptDHhv --delay-updates"
DESTPATH="$TREEPREFIX/development/$BRANCHED/"
-
+# basepath of $0
+scriptname="${0##*/}
[ -z "$DATE" ] && {
- echo "usage: buildrawhide <date>"
+ echo "usage: ${scriptname} <date>"
exit 1
}
9 years, 7 months
[releng] buildrawhide: Cleanup logging
by Till Maas
commit ad2136ff96ff18012d9dca12ca450d469438f38f
Author: Till Maas <opensource(a)till.name>
Date: Mon Sep 29 20:14:57 2014 +0200
buildrawhide: Cleanup logging
- Use variables and log() function
scripts/buildrawhide | 102 ++++++++++++++++++++++++++++----------------------
1 files changed, 57 insertions(+), 45 deletions(-)
---
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index 945abd7..bc23fca 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -47,11 +47,23 @@ DESTPATH="$TREEPREFIX/development/$BRANCHED/"
}
TMPDIR=`mktemp -d /tmp/rawhide.$DATE.XXXX`
-mkdir -p /mnt/koji/mash/rawhide-$DATE/logs
-echo "Compose started at $(date --utc) > /mnt/koji/mash/rawhide-$DATE/logs/start"
+logdir="/mnt/koji/mash/rawhide-$DATE/logs"
+mkdir -p "${logdir}"
-touch /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
-echo "$(date --utc) buildrawhide: started" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+
+echo "Compose started at $(date --utc)" > "$logdir/start"
+
+
+
+logfile="${logdir}/buildrawhide.log"
+touch "${logfile}"
+function log()
+{
+ message="${1}"
+ echo "$(date --utc) buildrawhide: ${message}" >> "${logfile}"
+}
+
+log "started"
# Emit a message using bodhi's cert (since we should be running as "masher").
echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
--cert-prefix bodhi \
@@ -59,25 +71,25 @@ echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fe
--topic rawhide.start \
--json-input
-echo "$(date --utc) buildrawhide: git clone of comps started" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+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 /mnt/koji/mash/rawhide-$DATE/logs/
+ cp comps-rawhide.xml $logdir/
popd
}
popd
-echo "$(date --utc) buildrawhide: git clone of comps finished" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "git clone of comps finished"
-[ -f /mnt/koji/mash/rawhide-$DATE/logs/comps-rawhide.xml ] || exit 1
+[ -f $logdir/comps-rawhide.xml ] || exit 1
-echo "$(date --utc) buildrawhide: mock init" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "mock init"
mock -r $MOCKCONFIG --uniqueext=$DATE --init
-echo "$(date --utc) buildrawhide: mock install base packages" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "mock install base packages"
mock -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview hardlink
# Copy in the hosts file so that we get the right address for koji
-echo "$(date --utc) buildrawhide: mock setup /etc/hosts" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "mock setup /etc/hosts"
mock -r $MOCKCONFIG --uniqueext=$DATE --copyin /etc/hosts /etc/hosts >/dev/null 2>&1 # this reports to fail, but actually works
# Emit a message using bodhi's cert (since we should be running as "masher").
@@ -87,9 +99,9 @@ echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fe
--topic rawhide.mash.start \
--json-input
-echo "$(date --utc) buildrawhide: starting mash" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+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 /mnt/koji/mash/rawhide-$DATE --compsfile /mnt/koji/mash/rawhide-$DATE/logs/comps-rawhide.xml rawhide$EXPANDARCH > /mnt/koji/mash/rawhide-$DATE/logs/mash.log 2>&1" || exit 1
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "mash $MASHOPTS -p $TREEPREFIX/development/rawhide -o /mnt/koji/mash/rawhide-$DATE --compsfile $logdir/comps-rawhide.xml rawhide$EXPANDARCH > $logdir/mash.log 2>&1" || exit 1
# Emit a message using bodhi's cert (since we should be running as "masher").
echo "{\"log\": \"done\", \"branch\": \"rawhide\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
@@ -98,20 +110,20 @@ echo "{\"log\": \"done\", \"branch\": \"rawhide\", \"arch\": \"$ARCH\"}" | fedms
--topic rawhide.mash.complete \
--json-input
-echo "$(date --utc) buildrawhide: finished mash" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
-echo "$(date --utc) buildrawhide: starting hardlink" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "finished mash"
+log "starting hardlink"
# hardlink the noarch deltarpms between x86_64 and i386
mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "hardlink -v -c /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/*/os/drpms/"
-echo "$(date --utc) buildrawhide: finished hardlink" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "finished hardlink"
-echo "$(date --utc) buildrawhide: starting repodiff" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+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:///mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/source/SRPMS --old=file://$TREEPREFIX/development/rawhide/source/SRPMS > /mnt/koji/mash/rawhide-$DATE/logs/repodiff"
-echo "$(date --utc) buildrawhide: finished repodiff" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "/usr/bin/repodiff -s -q --new=file:///mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/source/SRPMS --old=file://$TREEPREFIX/development/rawhide/source/SRPMS > $logdir/repodiff"
+log "finished repodiff"
-echo "$(date --utc) buildrawhide: starting spam-o-matic" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
-mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "/usr/share/mash/spam-o-matic $DEPOPTS /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH >/mnt/koji/mash/rawhide-$DATE/logs/depcheck" &
-echo "$(date --utc) buildrawhide: finished spam-o-matic" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "starting spam-o-matic"
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "/usr/share/mash/spam-o-matic $DEPOPTS /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH >$logdir/depcheck" &
+log "finished spam-o-matic"
# Emit a message using bodhi's cert (since we should be running as "masher").
echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
@@ -120,20 +132,20 @@ echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fe
--topic rawhide.pungify.start \
--json-input
-echo "$(date --utc) buildrawhide: starting critppath generation" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "starting critppath generation"
#only run critpath on primary arch
[ -z "$ARCH" ] && {
./scripts/critpath.py --url file:///mnt/koji/mash/$DIST-$DATE/$BRANCHED/ -o /mnt/koji/mash/$DIST-$DATE/logs/critpath.txt branched &> /mnt/koji/mash/$DIST-$DATE/logs/critpath.log
-echo "$(date --utc) buildrawhide: finished critppath generation" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "finished critppath generation"
-echo "$(date --utc) buildrawhide: starting pungify" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "starting pungify"
for basearch in armhfp i386 x86_64 ; do
HOST=$(koji list-hosts --quiet --enabled --ready --arch=$basearch --channel compose | sed 's|/| |g' | sort -g -k4 -k5r | awk -F ' ' '{ print $1 ; exit }')
./scripts/pungify $DATE $BRANCHED $basearch $HOST $DIST > /mnt/koji/mash/$DIST-$DATE/logs/pungify-$basearch.log 2>&1 &
done
}
wait
-echo "$(date --utc) buildrawhide: finished pungify" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "finished pungify"
# Emit a message using bodhi's cert (since we should be running as "masher").
echo "{\"log\": \"done\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
@@ -142,27 +154,27 @@ echo "{\"log\": \"done\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fed
--topic rawhide.pungify.complete \
--json-input
-echo "$(date --utc) buildrawhide: starting build_composeinfo" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "starting build_composeinfo"
echo "Running build_composeinfo"
./scripts/build_composeinfo --name Fedora-${BRANCHED}-${DATE} /mnt/koji/mash/$DIST-$DATE/$BRANCHED/
wait
-echo "$(date --utc) buildrawhide: finished build_composeinfo" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
-echo "$(date --utc) buildrawhide: starting mock clean" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "finished build_composeinfo"
+log "starting mock clean"
mock -r $MOCKCONFIG --uniqueext=$DATE --clean
-echo "$(date --utc) buildrawhide: finished mock clean" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "finished mock clean"
[ -n "$NOSYNC" ] && exit $rc
-echo "$(date --utc) buildrawhide: started linking finished tree" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "started linking finished tree"
# Create a rawhide link in /mnt/koji/mash, deltas et al depend on this
rm /mnt/koji/mash/$DIST
ln -s /mnt/koji/mash/$DIST-$DATE/$BRANCHED$EXPANDARCH/ /mnt/koji/mash/$DIST
-echo "$(date --utc) buildrawhide: finished linking finished tree" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "finished linking finished tree"
-echo "Compose finished at $(date --utc)" >> /mnt/koji/mash/rawhide-$DATE/logs/finish
-echo >> /mnt/koji/mash/rawhide-$DATE/logs/finish
-echo "$(date --utc) buildrawhide: finished compose" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+echo "Compose finished at $(date --utc)" >> $logdir/finish
+echo >> $logdir/finish
+log "finished compose"
# Emit a message using bodhi's cert (since we should be running as "masher").
echo "{\"log\": \"start\", \"branch\": \"rawhide\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
@@ -171,12 +183,12 @@ echo "{\"log\": \"start\", \"branch\": \"rawhide\", \"arch\": \"$ARCH\"}" | fedm
--topic rawhide.rsync.start \
--json-input
-echo "$(date --utc) buildrawhide: started rawhide compose sync" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "started rawhide compose sync"
# data
$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS --exclude repodata/ /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/ $DESTPATH
# repodata & cleanup
$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS --delete --delete-after /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/ $DESTPATH
-echo "$(date --utc) buildrawhide: finished rawhide compose sync" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "finished rawhide compose sync"
if [ "$?" = "0" ]; then
export mail=0
@@ -189,13 +201,13 @@ echo "{\"log\": \"done\", \"branch\": \"rawhide\", \"arch\": \"$ARCH\"}" | fedms
--topic rawhide.rsync.complete \
--json-input
-echo "$(date --utc) buildrawhide: starting sending rawhide email report" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "starting sending rawhide email report"
if [ "$mail" = "0" ]; then
for tomail in "$(echo $TOMAIL)" ; do
- cat /mnt/koji/mash/rawhide-$DATE/logs/start /mnt/koji/mash/rawhide-$DATE/logs/depcheck /mnt/koji/mash/rawhide-$DATE/logs/repodiff /mnt/koji/mash/rawhide-$DATE/logs/finish | mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
+ cat $logdir/start $logdir/depcheck $logdir/repodiff $logdir/finish | mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
done
fi
-echo "$(date --utc) buildrawhide: finished sending rawhide email report" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "finished sending rawhide email report"
[ -z "$ARCH" ] && {
# Emit a message using bodhi's cert (since we should be running as "masher").
@@ -205,17 +217,17 @@ echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fe
--topic rawhide.image.start \
--json-input
-echo "$(date --utc) buildrawhide: started checking out spin-kickstarts" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "started checking out spin-kickstarts"
pushd ../
git clone git://git.fedorahosted.org/git/spin-kickstarts/
pushd spin-kickstarts
#git checkout f$BRANCHED
-echo "$(date --utc) buildrawhide: finished checking out spin-kickstarts" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
-echo "$(date --utc) buildrawhide: started building live/arm/cloud images" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "finished checking out spin-kickstarts"
+log "started building live/arm/cloud images"
../releng/scripts/build-livecds $BRANCHED $DATE $BRANCHED
../releng/scripts/build-arm-images $BRANCHED $DATE $BRANCHED
../releng/scripts/build-cloud-images $BRANCHED $DATE $BRANCHED
-echo "$(date --utc) buildrawhide: finished starting building live/arm/cloud images" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
+log "finished starting building live/arm/cloud images"
popd
popd
@@ -236,7 +248,7 @@ do
elif [ "$koji" = "s390" ]; then
arches=s390,s390x
fi
- scripts/srpm-excluded-arch.py -a $arches --path /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/source/SRPMS/*/ >/mnt/koji/mash/rawhide-$DATE/logs/excludearch-$koji.log
+ scripts/srpm-excluded-arch.py -a $arches --path /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/source/SRPMS/*/ >$logdir/excludearch-$koji.log
done
9 years, 7 months
[releng] buildrawhide: sync with buildbranched
by Till Maas
commit ae7b153c0749e7b62c9fdf524776f7d55f76b2bf
Author: Till Maas <opensource(a)till.name>
Date: Mon Sep 29 19:51:34 2014 +0200
buildrawhide: sync with buildbranched
scripts/buildrawhide | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index e1beba2..945abd7 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -38,7 +38,7 @@ MOCKCONFIG=fedora-rawhide-compose-ppc64
}
RSYNC_OPTS="-rlptDHhv --delay-updates"
-DESTPATH="$TREEPREFIX/development/rawhide/"
+DESTPATH="$TREEPREFIX/development/$BRANCHED/"
[ -z "$DATE" ] && {
@@ -53,7 +53,7 @@ echo "Compose started at $(date --utc) > /mnt/koji/mash/rawhide-$DATE/logs/start
touch /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
echo "$(date --utc) buildrawhide: started" >> /mnt/koji/mash/rawhide-$DATE/logs/buildrawhide.log
# Emit a message using bodhi's cert (since we should be running as "masher").
-echo "{\"log\": \"start\", \"branch\": \"rawhide\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
+echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
--cert-prefix bodhi \
--modname compose \
--topic rawhide.start \
@@ -81,7 +81,7 @@ echo "$(date --utc) buildrawhide: mock setup /etc/hosts" >> /mnt/koji/mash/rawhi
mock -r $MOCKCONFIG --uniqueext=$DATE --copyin /etc/hosts /etc/hosts >/dev/null 2>&1 # this reports to fail, but actually works
# Emit a message using bodhi's cert (since we should be running as "masher").
-echo "{\"log\": \"start\", \"branch\": \"rawhide\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
+echo "{\"log\": \"start\", \"branch\": \"$BRANCHED\", \"arch\": \"$ARCH\"}" | fedmsg-logger \
--cert-prefix bodhi \
--modname compose \
--topic rawhide.mash.start \
9 years, 7 months
[releng] cleanup autosigner
by Till Maas
commit a1285d7fb381082ee09c079bb3948ee41a7507d2
Author: Till Maas <opensource(a)till.name>
Date: Mon Sep 29 19:49:36 2014 +0200
cleanup autosigner
scripts/autosigner.py | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/scripts/autosigner.py b/scripts/autosigner.py
index ba14e2f..d8388f0 100755
--- a/scripts/autosigner.py
+++ b/scripts/autosigner.py
@@ -45,14 +45,17 @@ import sigulsign_unsigned as sigulsign
TOPIC_PREFIX = u"org.fedoraproject.prod."
-TAG_INFO = {("f22",): "fedora-22",}
+TAG_INFO = {("f22", ): "fedora-22", }
secondary_instances = ["arm", "ppc", "s390"]
class SubjectSMTPHandler(logging.handlers.SMTPHandler):
+
+ subject_prefix = ""
+
def getSubject(self, record):
first_line = record.message.split("\n")[0]
- fmt = "Autosigner: {0.levelname}: {first_line}"
+ fmt = self.subject_prefix + "{0.levelname}: {first_line}"
return fmt.format(record, first_line=first_line)
@@ -386,6 +389,7 @@ def setup_logging():
fedora_user = getpass.getuser()
mail_logger = SubjectSMTPHandler(
"127.0.0.1", fedora_user, [fedora_user], "Autosigner log event")
+ mail_logger.subject_prefix = "Autosigner: "
mail_logger.setLevel(logging.ERROR)
mail_logger.setFormatter(formatter)
log.addHandler(mail_logger)
9 years, 7 months
Fedora Release Engineering meeting summary for 2014-09-29
by Dennis Gilmore
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
======================================
#fedora-meeting-1: RELENG (2014-09-29)
======================================
Meeting started by dgilmore at 15:31:54 UTC. The full logs are available
at
http://meetbot.fedoraproject.org/fedora-meeting-1/2014-09-29/releng.2014-...
.
Meeting summary
- ---------------
* init process (dgilmore, 15:32:02)
* #5931 [Proposal] Move new branch and unretire requests to pkgdb2
(dgilmore, 15:35:17)
* LINK: https://fedorahosted.org/rel-eng/ticket/5931 (dgilmore,
15:35:22)
* nothing new from pingou (tyll, 15:35:35)
* #5967 Enable source repo generation (dgilmore, 15:35:55)
* ACTION: dgilmore still needs to ask for more info (tyll, 15:36:24)
* #4071 Block pushes to origin/ in gitolite ACLs (dgilmore, 15:37:04)
* LINK: https://fedorahosted.org/rel-eng/ticket/4071 (dgilmore,
15:37:09)
* patches in the ticket need review (tyll, 15:38:05)
* ACTION: dgilmore to apply patch (dgilmore, 15:38:53)
* move to production after f21 with lots of changes (tyll, 15:44:27)
* #5878 noarch packages corrupted on import on ppc.koji.fp.o (dgilmore,
15:46:15)
* LINK: https://fedorahosted.org/rel-eng/ticket/5878 (dgilmore,
15:46:21)
* bug in koji (tyll, 15:47:29)
* #5959 Enable keep-alive connections for koji (primary and secondaries)
(dgilmore, 15:50:20)
* LINK: https://fedorahosted.org/rel-eng/ticket/5959 (dgilmore,
15:50:27)
* updating ticket was forgotten, it should be enabled everywhere
(tyll, 15:51:22)
* #5963 Orphaned vulnerable packages in EPEL (dgilmore, 15:51:32)
* LINK: https://fedorahosted.org/rel-eng/ticket/5963 (dgilmore,
15:51:35)
* ACTION: volunteer needed for tooling (dgilmore, 15:52:34)
* #6000 automate creation of excludelist for koji-shadow (dgilmore,
15:52:52)
* LINK: https://fedorahosted.org/rel-eng/ticket/6000 (dgilmore,
15:52:58)
* LINK:
http://kojipkgs.fedoraproject.org/mash/branched-20140929/logs/excludearch...
(dgilmore, 15:54:19)
* scripts were adjusted, but need debugging (tyll, 15:54:21)
* ACTION: dgilmore to fix up the calls (dgilmore, 15:58:34)
* #5886 need method for distributing urgent fixes... urgently
(dgilmore, 16:01:11)
* LINK: https://fedorahosted.org/rel-eng/ticket/5886 (dgilmore,
16:01:17)
* do not rely on fedmsg (tyll, 16:06:45)
* multilib needs to be taken care of (tyll, 16:12:42)
* ACTION: nirik create a wiki page (tyll, 16:12:53)
* mirrormanager needs changes (tyll, 16:13:54)
* https://fedorahosted.org/rel-eng/ticket/5775 (dgilmore, 16:16:24)
* LINK: https://fedorahosted.org/rel-eng/ticket/5775 (dgilmore,
16:16:27)
* LINK: https://fedoraproject.org/wiki/Urgent_updates_policy is the
draft I put up. Please edit/add. (nirik, 16:16:38)
* this is what oddshocks's upload service does (tyll, 16:19:07)
* #5819 Need tags deleted in python-heatclient repo (dgilmore,
16:20:19)
* LINK: https://fedorahosted.org/rel-eng/ticket/5819 (dgilmore,
16:20:22)
* koji should be changed to create non-scratch builds only from full
commit hashes (tyll, 16:28:56)
* LINK: https://fedorahosted.org/rel-eng/ticket/5843 (tyll,
16:30:30)
* LINK: https://fedorahosted.org/koji/ticket/281 (tyll, 16:30:41)
* tags cannot be removed, because they might have been used to build
something (tyll, 16:31:32)
* ACTION: dgilmore to close the ticket as wontfix with and explanation
as to why (dgilmore, 16:32:27)
* #5914 Move fedmsg based blocking service to Fedora Infrastructure
(dgilmore, 16:32:35)
* LINK: https://fedorahosted.org/rel-eng/ticket/5914 (dgilmore,
16:32:41)
* ACTION: till to get teh script in to the releng git repo and wire up
buildbranched and buildrawhide to run it (dgilmore, 16:41:25)
* ACTION: dgilmore to make sure the masher user can block the packages
and that till wires thinsg up correctly (dgilmore, 16:41:54)
* Secondary Architectures updates (dgilmore, 16:46:43)
* Secondary Architectures update - ppc (dgilmore, 16:54:02)
* ppc Alpha TC2 out and being tested, hopefully RC soon (dgilmore,
16:55:48)
* Secondary Architectures update - s390 (dgilmore, 16:56:00)
* Secondary Architectures update - arm (dgilmore, 17:00:28)
* Open Floor (dgilmore, 17:11:36)
* LINK:
https://lists.fedoraproject.org/pipermail/releng-cron/2014-September/0026...
and
https://lists.fedoraproject.org/pipermail/releng-cron/2014-September/0026...
(nirik, 17:12:02)
* cron jobs fail because of dwa's expired koji certificate (tyll,
17:13:24)
* ACTION: pbrobinson takes care to fix them (tyll, 17:13:55)
* LINK:
http://fedoraproject.org/wiki/Packaging:Guidelines#Desktop_files
(dgilmore, 17:29:52)
* LINK:
https://fedoraproject.org/wiki/Packaging:Guidelines#Desktop_files
(nirik, 17:36:23)
Meeting ended at 17:48:20 UTC.
Action Items
- ------------
* dgilmore still needs to ask for more info
* dgilmore to apply patch
* volunteer needed for tooling
* dgilmore to fix up the calls
* nirik create a wiki page
* dgilmore to close the ticket as wontfix with and explanation as to why
* till to get teh script in to the releng git repo and wire up
buildbranched and buildrawhide to run it
* dgilmore to make sure the masher user can block the packages and that
till wires thinsg up correctly
* pbrobinson takes care to fix them
Action Items, by person
- -----------------------
* dgilmore
* dgilmore still needs to ask for more info
* dgilmore to apply patch
* dgilmore to fix up the calls
* dgilmore to close the ticket as wontfix with and explanation as to
why
* dgilmore to make sure the masher user can block the packages and
that till wires thinsg up correctly
* nirik
* nirik create a wiki page
* pbrobinson
* pbrobinson takes care to fix them
* **UNASSIGNED**
* volunteer needed for tooling
* till to get teh script in to the releng git repo and wire up
buildbranched and buildrawhide to run it
People Present (lines said)
- ---------------------------
* dgilmore (251)
* nirik (67)
* tyll (61)
* kalev (39)
* bochecha (34)
* sharkcz (34)
* pbrobinson (30)
* zodbot (6)
* mbooth (2)
* masta (0)
Generated by `MeetBot`_ 0.1.4
.. _`MeetBot`: http://wiki.debian.org/MeetBot
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBAgAGBQJUKZuzAAoJEH7ltONmPFDRhgQP/RUbUDvjsxlyS6viycuzSONc
+KqbQU1Jxiyla42K8PseawadFz+fSm8j7rhqgzsIFXlHLyIH1ZSOHJIU1jLvzQtb
f4OqlXHOwRAS4g5eZnsoFtwg1LZkLbgADQscy8rJGvHS2XKqu2NMFliQN9BQU702
ktVqrd1IspkEpAqESThSyT5OzDAisCKQwSM8Kehre3EugpN8DcGVcdZM1PBvgxnC
DS8ej/pEFKg/2FPulvzmDUru+lfP2a2jFrGQUoNYtHZlBPZb2gnTIC1ruq0Tpidl
i2RSjOsfsVzOHKVYzUJyeG53/GAVhOjrHzcXSlV7aUyQqDLasQoP0QyNVv9giSVo
CGjJR/8Whu+/xDLnmit/KevDUanFPDeMxDZixGnsBmJiJ3KINTPhL2FdBjs8ZrCr
Mi3cNKeDUWAT6LxMZ/FKgolA4I7UPECrzgRpMEAx2R16jIbCm9kP6NEtdqjmboa/
I1zVo8sO8NYwoYRFltdgzi57qh5KVT4NmHP2VSsk/3uKKK1gpI1//u+H63ciDcQ0
FhQHvEpExshtljup8rx6I+943Xy0epwJ/AD1I3j7JcPWFp+wJRk6G426bCEWOMUh
VteoVwKhSDWEmAqc1YmgsDWPa2s0bKZ/cu+/o3N4vJtzCXK5tQqsSjnQ6C7BCtQW
pJm2lHtLH/Lhe3s+QP2p
=DxvX
-----END PGP SIGNATURE-----
9 years, 7 months
[releng] buildbranched: Sync DIST variable position with buildrawhide
by Till Maas
commit 5ca8fe4df4790b71462fb9a9da1d7454eefa0d30
Author: Till Maas <opensource(a)till.name>
Date: Mon Sep 29 19:46:00 2014 +0200
buildbranched: Sync DIST variable position with buildrawhide
scripts/buildbranched | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/buildbranched b/scripts/buildbranched
index bb59162..7b52c60 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -9,6 +9,7 @@ DATE=$1
ARCH=$2
BRANCHED="21"
+DIST=branched
TREEPREFIX="/pub/fedora/linux"
MASHDIR="/mnt/koji/mash/branched-$DATE"
@@ -39,7 +40,6 @@ MOCKCONFIG=fedora-branched-compose-ppc64
RSYNC_OPTS="-rlptDHhv --delay-updates"
DESTPATH="$TREEPREFIX/development/$BRANCHED/"
-DIST=branched
[ -z "$DATE" ] && {
echo "usage: buildbranched <date>"
9 years, 7 months