unity/scripts
by Jeroen van Meeuwen
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
15 years, 2 months
revisor/__init__.py.in
by Jeroen van Meeuwen
revisor/__init__.py.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 43b9135d65d4bf1d51325cb40457672db0142330
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 19:25:52 2009 +0100
Ignore errors in the other shutil.rmtree() too
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 9415a37..4eec8f8 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -522,6 +522,6 @@ class Revisor:
# Remove everything
for dir in ["revisor-yumcache"]:
if os.access(os.path.join(self.base.cfg.working_directory, dir), os.R_OK):
- shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir))
+ shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir), ignore_errors=True)
sys.exit(exitcode)
15 years, 2 months
revisor/__init__.py.in
by Jeroen van Meeuwen
revisor/__init__.py.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f20ed2c36443c8ce27aff16ccbd10338eeceb111
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 19:15:10 2009 +0100
If a sys.exit() call says $? -gt 0 then exit with that same $?
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 6585844..9415a37 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -497,8 +497,8 @@ class Revisor:
try:
self.base.run()
- except SystemExit:
- pass
+ except SystemExit, e:
+ exitcode = e
except KeyboardInterrupt:
exitcode = 1
self.base.log.info(_("Interrupted by user"))
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2b56cb1daa9ca48bf3db3fd2937b5fa50e96a437
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 18:02:11 2009 +0100
anaconda-runtime does not exist anymore, nor does pygtk
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 4a4deff..c6d4040 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -50,9 +50,9 @@ if [ $# -eq 0 ]; then
fi
revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
- anaconda-runtime squashfs-tools busybox-anaconda notify-python usermode
+ anaconda squashfs-tools busybox-anaconda notify-python usermode
pam python automake intltool gettext desktop-file-utils glib2-devel gcc
- cobbler koan deltarpm pygtk pygtk2-libglade gnome-python2-gconf
+ cobbler koan deltarpm pygtk2-libglade gnome-python2-gconf
system-config-kickstart jigdo livecd-tools python-virtinst git sudo
spin-kickstarts mock"
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 833ee44eb7cc5db4420b746d4daa868d280ff026
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 17:58:53 2009 +0100
That didn't help, because the output is sent to stdout no matter what :/
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 695dee2..4a4deff 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -93,7 +93,7 @@ done
# on are actually installed
for pkg in $revisor_deps; do
- if [ -z "`rpm -qv $pkg 2>/dev/null`" ]; then
+ if [ -z "`rpm -qv $pkg | grep -v 'not installed'`" ]; then
pkg_error="$pkg_error\nPackage $pkg not installed"
fi
done
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b1a2c8dad1f293b56f3c5a7a86500c22303536c9
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 17:56:58 2009 +0100
Redirect stderr to /dev/null
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index e9bfcf3..695dee2 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -93,7 +93,7 @@ done
# on are actually installed
for pkg in $revisor_deps; do
- if [ -z "`rpm -qv $pkg`" ]; then
+ if [ -z "`rpm -qv $pkg 2>/dev/null`" ]; then
pkg_error="$pkg_error\nPackage $pkg not installed"
fi
done
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3202c47cc4bd04e0afbbd9cf18028b9f1e47efa8
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 17:12:33 2009 +0100
Update respin.sh
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 668a710..e9bfcf3 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -119,7 +119,7 @@ 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
+[ -d /tmp/spin-kickstarts ] && sudo rm -rf /tmp/spin-kickstarts
git clone git://git.fedorahosted.org/spin-kickstarts.git /tmp/spin-kickstarts
for version in $VERSIONS; do
@@ -141,7 +141,7 @@ for version in $VERSIONS; do
# 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/
+ sudo rm -rf /srv/revisor/$datestamp/$spin/log/
${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
--model $spin --debug 9 --clean-up $cleanup \
@@ -179,7 +179,7 @@ for version in $VERSIONS; do
# 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/
+ 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
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7a229a7db22510f0db87c95442f133f39a1960c2
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 16:41:39 2009 +0100
Make respins.sh pull over git:// (cronjobs do not have the ssh keys loaded)
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index e1681aa..668a710 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -103,7 +103,7 @@ done
if [ -d ~/devel/revisor/master ]; then
cd ~/devel/revisor/master
- git pull
+ git pull git://git.fedorahosted.org/revisor master
autoreconf -v && ./configure
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 50975180514877c2b34344c351b232069e4a6e82
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 16:40:33 2009 +0100
More updates to respin.sh
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 6561338..e1681aa 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -37,6 +37,9 @@ function usage() {
echo " be specified multiple times."
echo "--arch <arch> - The architectures to respin. Can also be specified"
echo " multiple times."
+ echo ""
+ echo "--cleanup - Pass Revisor how to clean up after itself (default: 1)"
+ echo " See Revisor help for details"
echo "--list - Just list what would have otherwise been respun."
exit 1
@@ -58,6 +61,7 @@ revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
##
JUST_LIST=0
+cleanup=1
while [ $# -gt 0 ]; do
case $1 in
@@ -70,6 +74,11 @@ while [ $# -gt 0 ]; do
shift; shift
;;
+ --clean-up|--cleanup)
+ cleanup=$2
+ shift; shift
+ ;;
+
--list)
JUST_LIST=1
shift
@@ -135,7 +144,7 @@ for version in $VERSIONS; do
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 \
+ --model $spin --debug 9 --clean-up $cleanup \
--destination-directory /srv/revisor/$datestamp/ \
--report-sizes 2>&1 | tee revisor-$spin.log
@@ -172,7 +181,7 @@ for version in $VERSIONS; do
#
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
+ 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" \
@@ -187,4 +196,4 @@ for version in $VERSIONS; do
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/
done
-done
\ No newline at end of file
+done
15 years, 2 months
2 commits - unity/conf unity/scripts
by Jeroen van Meeuwen
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
15 years, 2 months