summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-09-23 15:12:53 +0200
committerHolger Levsen <holger@layer-acht.org>2014-09-23 15:12:53 +0200
commitc418dc0ece6e1ececde993963fab793487441088 (patch)
treeb338f8e08c61fc017c45c18bf96a7f03651e7f1b
parent776bfb1ed7aace615bce7f9b5613cff1c248d2f9 (diff)
downloadjenkins.debian.net-c418dc0ece6e1ececde993963fab793487441088.tar.xz
g-i: only workaround #757818 on squeeze+wheezy, which are affected by the bug. this speeds up jessie tests.
-rwxr-xr-xbin/g-i-installation.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 612b645a..df50aa8f 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -130,8 +130,14 @@ bootstrap_system() {
cd $WORKSPACE
echo "Creating throw-away logical volume with ${DISKSIZE_IN_GB} GiB now."
sudo lvcreate -L${DISKSIZE_IN_GB}G -n $NAME $VG
- echo "Workaround to remove swap signature from previous installs, see #757818"
- time sudo dd if=/dev/zero of=$LV bs=4096 || true
+ # FIXME: the following will become unneeded / simpler once squeeze+wheezy are not tested anymore
+ RELEASE="$(echo $NAME | cut -d "_" -f2)"
+ if [ "$RELEASE" != "jessie" ] ; then
+ echo "Workaround to remove swap signature from previous installs, see #757818"
+ time sudo dd if=/dev/zero of=$LV bs=4096 || true
+ else
+ echo "Release $RELEASE detected, where #757818 should be fixed, thus not applying workaround..."
+ fi
echo "Creating raw disk image with ${DISKSIZE_IN_GB} GiB now."
sudo qemu-img create -f raw $LV ${DISKSIZE_IN_GB}G
echo "Doing g-i installation test for $NAME now."