summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2012-12-12 13:24:50 +0100
committerHolger Levsen <holger@layer-acht.org>2012-12-12 13:24:50 +0100
commit4e2ce8d93afca336e94ce13f4455ca655c618806 (patch)
tree144c31c9af2fe2cb247b59e065054feee1d98bc3 /bin
parenta305f8a8fda976769f319b2255f979eb30ae47e4 (diff)
downloadjenkins.debian.net-4e2ce8d93afca336e94ce13f4455ca655c618806.tar.xz
five new jobs for g-i edu testing
Diffstat (limited to 'bin')
-rwxr-xr-xbin/g-i-installation.sh24
1 files changed, 10 insertions, 14 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 2e0000d1..71668ff1 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -121,26 +121,22 @@ bootstrap() {
INST_LOCALE="locale=en_US"
INST_KEYMAP="keymap=us"
INST_VIDEO="video=vesa:ywrap,mtrr vga=788"
+ EXTRA_APPEND=""
case $JOB_NAME in
- *debian-edu_wheezy-test_workstation)
- EXTRA_APPEND=""
- ;;
- *debian-edu_squeeze-test_standalone)
+ *debian-edu_squeeze-test*)
INST_KEYMAP="console-keymaps-at/$INST_KEYMAP"
- EXTRA_APPEND=""
;;
- *debian_wheezy_lxde)
- EXTRA_APPEND="desktop=lxde"
+ *_sid_daily*)
+ EXTRA_APPEND="mirror/suite=sid"
;;
- *debian_sid_daily-lxde)
- EXTRA_APPEND="desktop=lxde mirror/suite=sid"
+ esac
+ case $JOB_NAME in
+ *debian_*lxde)
+ EXTRA_APPEND="$EXTRA_APPEND desktop=lxde"
;;
- *debian_sid_daily-rescue)
- EXTRA_APPEND="rescue/enable=true mirror/suite=sid"
+ *debian_*rescue)
+ EXTRA_APPEND="$EXTRA_APPEND rescue/enable=true"
;;
- *) echo "unsupported distro."
- exit 1
- ;;
esac
APPEND="auto=true priority=critical $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP $PRESEED_URL $INST_VIDEO -- quiet"
show_preseed $(hostname -f)/$PRESEED_PATH/${NAME}-preseed.cfg