unity/scripts/respin.sh | 121 ++++++++++++++++++++++++++++--------------------
1 file changed, 71 insertions(+), 50 deletions(-)
New commits:
commit 03f47d648839ae808c5452fb912a0679798b3ac1
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 19:29:58 2009 +0100
Update the required packages ($revisor_deps)
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index c6d4040..4ec8edb 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -54,17 +54,32 @@ revisor_deps="comps-extras createrepo rhpl pykickstart
livecd-tools
pam python automake intltool gettext desktop-file-utils glib2-devel gcc
cobbler koan deltarpm pygtk2-libglade gnome-python2-gconf
system-config-kickstart jigdo livecd-tools python-virtinst git sudo
- spin-kickstarts mock"
+ spin-kickstarts mock yum-utils"
##
## Defaults
##
+LIVE=0
+INSTALL=0
JUST_LIST=0
cleanup=1
+##
+## Get the options
+##
+
while [ $# -gt 0 ]; do
case $1 in
+ --live)
+ LIVE=1
+ shift
+ ;;
+ --install)
+ INSTALL=1
+ shift
+ ;;
+
--version)
VERSIONS="$VERSIONS $2"
shift; shift
@@ -132,68 +147,74 @@ for version in $VERSIONS; do
cd $ourwd
for arch in $ARCHES; do
- for spin in `${revisor_cmd} --config
/etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^
f$version-$arch-" | awk '{print $1}'`; do
- datestamp=`date +'%Y%m%d'`
+ if [ $LIVE -eq 1 ]; then
+ for spin in `${revisor_cmd} --config
/etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^
f$version-$arch-" | awk '{print $1}'`; do
- [ $JUST_LIST -eq 1 ] && echo $spin && continue
+ 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 ;-)
- #
- sudo rm -rf /srv/revisor/$datestamp/$spin/log/
+ [ $JUST_LIST -eq 1 ] && echo $spin && continue
- ${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
- --model $spin --debug 9 --clean-up $cleanup \
- --destination-directory /srv/revisor/$datestamp/ \
- --report-sizes 2>&1 | tee revisor-$spin.log
+ # Let's make sure we remove the entire directory before we attempt a
respin.
+ # The log files get confusing, you know ;-)
+ #
+ sudo rm -rf /srv/revisor/$datestamp/$spin/log/
- [ $? -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
+ ${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
+ --model $spin --debug 9 --clean-up $cleanup \
+ --destination-directory /srv/revisor/$datestamp/ \
+ --report-sizes 2>&1 | tee revisor-$spin.log
- sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
- sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
- done
+ [ $? -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
- [ $JUST_LIST -eq 1 ] && echo f$version-$arch-respin && continue
+ sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
+ sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
+ done
+ fi
- spin_name="f$version-$arch-respin"
+ if [ $INSTALL -eq 1 ]; then
- 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 && \
- echo -en "git clone
git://git.fedorahosted.org/revisor\n" | mock -r
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- 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 && \
+ [ $JUST_LIST -eq 1 ] && echo f$version-$arch-respin &&
continue
- datestamp=`date +'%Y%m%d'`
+ 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 && \
+ echo -en "git clone
git://git.fedorahosted.org/revisor\n" | mock -r
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ 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 ;-)
- #
- sudo rm -rf /srv/revisor/$datestamp/f$version-$arch-respin/log/
+ # Let's make sure we remove the entire directory before we attempt a
respin.
+ # The log files get confusing, you know ;-)
+ #
+ sudo 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 --clean-up
$cleanup\n" | mock -r fedora-$version-$arch shell | tee -a
revisor-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 --clean-up
$cleanup\n" | mock -r fedora-$version-$arch shell | tee -a
revisor-f$version-$arch-respin.log
- [ $? -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
+ [ $? -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/
+ 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/
+ fi
done
done