From 73925d612b31635e451bc9e31425ea0fa4720900 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 18 Oct 2014 11:33:45 +0200 Subject: g-i-installation: use unique names for rescue jobs names, use correct d-i preseed files names. --- bin/g-i-installation.sh | 3 +-- job-cfg/g-i-installation.yaml | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 0c0d63b0..5bfd912c 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -56,11 +56,9 @@ mkdir -p $RESULTS/log if [ -z "$5" ] || [ -z "$6" ] ; then DI_LANG="en" DI_LOCALE="en_US" - PRESEEDCFG="preseed.cfg" else DI_LANG=$5 DI_LOCALE=$6 - PRESEEDCFG="${DI_LANG}_preseed.cfg" fi # @@ -160,6 +158,7 @@ bootstrap_system() { QEMU_OPTS="$QEMU_OPTS -drive file=$LV,index=0,media=disk,cache=unsafe -m $RAMSIZE -net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254" QEMU_WEBSERVER=http://10.0.2.1/ # preseeding related variables + PRESEEDCFG="preseed.cfg" PRESEED_PATH=d-i-preseed-cfgs PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_$PRESEEDCFG" INST_LOCALE="locale=$DI_LOCALE" diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml index 30fc7c1a..5328e761 100644 --- a/job-cfg/g-i-installation.yaml +++ b/job-cfg/g-i-installation.yaml @@ -496,109 +496,109 @@ my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_spanish': my_title: 'Debian (sid daily build CD) rescue mode in Spanish' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 29 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso es es_ES' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 29 debian_sid_daily_rescue_spanish 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso es es_ES' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '23 7 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_japanese': my_title: 'Debian (sid daily build CD) rescue mode in Japanese' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 30 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ja ja_JA' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 30 debian_sid_daily_rescue_japanese 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ja ja_JA' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 7 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_chinese': my_title: 'Debian (sid daily build CD) rescue mode in Chinese (China)' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 31 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso zh zh_CN' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 31 debian_sid_daily_rescue_chinese 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso zh zh_CN' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '23 8 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_korean': my_title: 'Debian (sid daily build CD) rescue mode in Korean' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 32 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ko ko_KR' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 32 debian_sid_daily_rescue_korean 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ko ko_KR' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 8 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_russian': my_title: 'Debian (sid daily build CD) rescue mode in Russian' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 33 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ru ru_RU' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 33 debian_sid_daily_rescue_russian 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ru ru_RU' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 9 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_greek': my_title: 'Debian (sid daily build CD) rescue mode in Greek' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 34 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso el el_GR' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 34 debian_sid_daily_rescue_greek 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso el el_GR' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 9 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_vietnamese': my_title: 'Debian (sid daily build CD) rescue mode in Vietnamese' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 35 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso vi vi_VI' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 35 debian_sid_daily_rescue_vietnamese 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso vi vi_VI' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 9 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_hebrew': my_title: 'Debian (sid daily build CD) rescue mode in Hebrew' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 36 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso he he_IL' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 36 debian_sid_daily_rescue_hebrew 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso he he_IL' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '23 10 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_hindi': my_title: 'Debian (sid daily build CD) rescue mode in Hindi' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 37 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso hi hi_IN' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 37 debian_sid_daily_rescue_hindi 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso hi hi_IN' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '23 10 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_tamil': my_title: 'Debian (sid daily build CD) rescue mode in Tamil' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 38 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ta ta_IN' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 38 debian_sid_daily_rescue_tamil 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ta ta_IN' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 10 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_tibetan': my_title: 'Debian (sid daily build CD) rescue mode in Tibetan' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 39 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso bo bo_IN' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 39 debian_sid_daily_rescue_tibetan 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso bo bo_IN' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '23 11 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_gujarati': my_title: 'Debian (sid daily build CD) rescue mode in Gujarati' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 40 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso gu gu_IN' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 40 debian_sid_daily_rescue_gujarati 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso gu gu_IN' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 11 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_kannada': my_title: 'Debian (sid daily build CD) rescue mode in Kannada' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 41 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso kn kn_IN' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 41 debian_sid_daily_rescue_kannada 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso kn kn_IN' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '23 12 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_malayalam': my_title: 'Debian (sid daily build CD) rescue mode in Malayalam' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 42 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ml ml_IN' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 42 debian_sid_daily_rescue_malayalam 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ml ml_IN' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 12 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_marathi': my_title: 'Debian (sid daily build CD) rescue mode in Marathi' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 43 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso mr mr_IN' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 43 debian_sid_daily_rescue_marathi 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso mr mr_IN' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '23 13 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_punjabi': my_title: 'Debian (sid daily build CD) rescue mode in Punjabi (Gurmukhi)' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 44 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso pa pa_IN' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 44 debian_sid_daily_rescue_punjabi 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso pa pa_IN' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 13 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_telugu': my_title: 'Debian (sid daily build CD) rescue mode in Telugu' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 45 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso te te_IN' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 45 debian_sid_daily_rescue_telugu 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso te te_IN' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '23 14 18 * *' my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_arabic': my_title: 'Debian (sid daily build CD) rescue mode in Arabic' - my_shell: '/srv/jenkins/bin/g-i-installation.sh 46 debian_sid_daily_rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ar ar_EG' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 46 debian_sid_daily_rescue_arabic 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso ar ar_EG' my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 14 18 * *' my_recipients: 'holger@layer-acht.org' -- cgit v1.2.3-54-g00ecf