unity/conf/f9-live-respin.conf | 8 ++---
unity/scripts/respin.sh | 65 +++++++++++++++++++++++++++++++++++++++--
2 files changed, 67 insertions(+), 6 deletions(-)
New commits:
commit 6c3da58493b45c51ab7fddb23af53090bb385e2c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 16:27:58 2009 +0100
Update respins.sh
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 0e16203..6561338 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -32,6 +32,14 @@
function usage() {
echo "$0 [options]"
+ echo ""
+ echo "--version <version> - The version of the distribution to respin.
Can"
+ echo " be specified multiple times."
+ echo "--arch <arch> - The architectures to respin. Can also be
specified"
+ echo " multiple times."
+ echo "--list - Just list what would have otherwise been
respun."
+
+ exit 1
}
if [ $# -eq 0 ]; then
@@ -45,6 +53,12 @@ revisor_deps="comps-extras createrepo rhpl pykickstart
livecd-tools
system-config-kickstart jigdo livecd-tools python-virtinst git sudo
spin-kickstarts mock"
+##
+## Defaults
+##
+
+JUST_LIST=0
+
while [ $# -gt 0 ]; do
case $1 in
--version)
@@ -55,6 +69,14 @@ while [ $# -gt 0 ]; do
ARCHES="$ARCHES $2"
shift; shift
;;
+
+ --list)
+ JUST_LIST=1
+ shift
+ ;;
+ *)
+ usage
+ ;;
esac
done
@@ -83,6 +105,10 @@ else
revisor_cmd="sudo revisor --cli"
fi
+MESSAGE_END="\\n\\nGo to http://$HOSTNAME/revisor/%b/%b/ for more details.\\n\\nKind
regards,\\n\\nJeroen van Meeuwen\n-kanarip"
+NOTIFICATION_FAILURE="kanarip(a)kanarip.com"
+NOTIFICATION_SUCCESS="kanarip(a)kanarip.com"
+
# Cheat our way through spin-kickstarts
[ -d /tmp/spin-kickstarts ] && rm -rf /tmp/spin-kickstarts
git clone
git://git.fedorahosted.org/spin-kickstarts.git /tmp/spin-kickstarts
@@ -101,17 +127,36 @@ for version in $VERSIONS; do
datestamp=`date +'%Y%m%d'`
+ [ $JUST_LIST -eq 1 ] && echo $spin && continue
+
+ # Let's make sure we remove the entire directory before we attempt a
respin.
+ # The log files get confusing, you know ;-)
+ #
+ rm -rf /srv/revisor/$datestamp/$spin/log/
+
${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
--model $spin --debug 9 --clean-up 2 \
--destination-directory /srv/revisor/$datestamp/ \
--report-sizes 2>&1 | tee revisor-$spin.log
- [ $? -gt 0 ] && echo "Spin $spin failed, log file attached"
| mail -s "$spin failed" -a revisor-$spin.log "kanarip(a)kanarip.com"
+ [ $? -gt 0 ] && \
+ printf "Spin $spin failed, log file attached.$MESSAGE_END"
"$datestamp" "$spin" \
+ | mail -s "[respin] $spin $datestamp failed" \
+ -a revisor-$spin.log \
+ -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
+ printf "Spin $spin succeeded, log file attached.$MESSAGE_END"
"$datestamp" "$spin" \
+ | mail -s "[respin] $spin $datestamp succeeded" \
+ -a revisor-$spin.log \
+ $NOTIFICATION_SUCCESS
sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
done
+ [ $JUST_LIST -eq 1 ] && echo f$version-$arch-respin && continue
+
+ spin_name="f$version-$arch-respin"
+
mock -r fedora-$version-$arch clean | tee revisor-f$version-$arch-respin.log
&& \
mock -r fedora-$version-$arch init | tee -a revisor-f$version-$arch-respin.log
&& \
mock -r fedora-$version-$arch install $revisor_deps | tee -a
revisor-f$version-$arch-respin.log && \
@@ -119,9 +164,25 @@ for version in $VERSIONS; do
echo -en "cd /revisor; ./switchhere --yes\n" | mock -r
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock
-r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+
+ datestamp=`date +'%Y%m%d'`
+
+ # Let's make sure we remove the entire directory before we attempt a respin.
+ # The log files get confusing, you know ;-)
+ #
+ rm -rf /srv/revisor/$datestamp/f$version-$arch-respin/log/
+
echo -en "cd /revisor; ./revisor.py --cli --config
/etc/revisor-unity/f$version-install-respin.conf --destination-directory
/srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9\n" | mock -r
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
- [ $? -gt 0 ] && echo "Spin f$version-$arch-respin failed, log file
attached" | mail -s "f$version-$arch-respin failed" -a
revisor-f$version-$arch-respin.log "kanarip(a)kanarip.com"
+ [ $? -gt 0 ] && \
+ printf "Spin f$version-$arch-respin failed, log file
attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
+ | mail -s "[respin] f$version-$arch-respin $datestamp failed"
\
+ -a revisor-f$version-$arch-respin.log \
+ -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
+ printf "Spin f$version-$arch-respin succeeded, log file
attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
+ | mail -s "[respin] f$version-$arch-respin $datestamp
succeeded" \
+ -a revisor-f$version-$arch-respin.log \
+ $NOTIFICATION_SUCCESS
sudo mkdir -p /srv/revisor/$datestamp/f$version-$arch-respin/log/
sudo mv revisor-f$version-$arch-respin.log
/srv/revisor/$datestamp/f$version-$arch-respin/log/
commit 73e9221ed70b24b5fbc01258e66a4156622b0ca4
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 16:27:45 2009 +0100
Update the descriptions for live spins on Fedora 9 as well
diff --git a/unity/conf/f9-live-respin.conf b/unity/conf/f9-live-respin.conf
index 608a6f2..2115d98 100644
--- a/unity/conf/f9-live-respin.conf
+++ b/unity/conf/f9-live-respin.conf
@@ -31,7 +31,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora
(Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f9-i386-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = i386
version = 9
@@ -139,7 +139,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora
(Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f9-x86_64-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
version = 9
@@ -247,7 +247,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora
(Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f9-ppc-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
version = 9
@@ -355,7 +355,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora
(Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f9-ppc64-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
version = 9