[svn:einsteintoolkit] tools/trunk/VirtualBox/ (Rev. 33) - Commits

9 May 2015

User: knarf
Date: 2015/05/09 11:56 AM
Added:
 /trunk/VirtualBox/
  install_ET_2015_05
Modified:
 /trunk/VirtualBox/
  create_ET, install_ET_trunk, postseed, preseed.cfg
Log:
 update for current VM status
File Changes:
Directory: /trunk/VirtualBox/
=============================
File [modified]: create_ET
Delta lines: +24 -19
===================================================================

--- trunk/VirtualBox/create_ET	2014-01-30 21:41:51 UTC (rev 32)
+++ trunk/VirtualBox/create_ET	2015-05-09 16:56:55 UTC (rev 33)
@@ -6,43 +6,48 @@
   exit 1
 fi
-CD_DST=debian_$RELEASE
+DIST=wheezy
+URL=http://cdimage.debian.org/mirror/cdimage/archive/7.8.0/amd64/iso-cd/debian-7...
+#DIST=jessie
+#URL=http://cdimage.debian.org/debian-cd/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-ne...
+
+CD_DST=${DIST}_$RELEASE
 rm -rf $CD_DST
 mkdir $CD_DST
-wget -N http://cdimage.debian.org/debian-cd/7.3.0/amd64/iso-cd/debian-7.3.0-amd64-ne...
-bsdtar -C $CD_DST -xf debian-7.3.0-amd64-netinst.iso
+wget -cN $URL
+bsdtar -C $CD_DST -xf `basename $URL`
 chmod -R +w $CD_DST
 cd $CD_DST
 perl -pi -e 's/initrd.gz/initrd.gz auto-install/enable=true preseed/file=/cdrom/preseed.cfg/'  isolinux/txt.cfg
 perl -pi -e 's/timeout 0/timeout 1/' isolinux/isolinux.cfg
 cp ../preseed.cfg ../postseed .
 mkdir et_misc
-if [ "X$RELEASE" = "XET_2011_10" ]; then
-  cp ../et.cfg et_misc/
-fi
 cp ../install_$RELEASE et_misc/
 md5sum `find ! -name "md5sum.txt" ! -path "./isolinux/*" -follow -type f` > md5sum.txt
 cd ..
-genisoimage -o $RELEASE.iso -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b isolinux/isolinux.bin -c isolinux/boot.cat $CD_DST
+genisoimage -o ${DIST}_$RELEASE.iso -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b isolinux/isolinux.bin -c isolinux/boot.cat $CD_DST
 rm -rf $CD_DST
-VBoxManage createvm --name $RELEASE --register
+VMNAME=${DIST}_$RELEASE
+VBoxManage createvm --name $VMNAME --register
+
 # standard settings
-VBoxManage modifyvm      $RELEASE --ostype Debian_64 --acpi on --biosbootmenu disabled --rtcuseutc on
+VBoxManage modifyvm      $VMNAME --ostype Debian_64 --acpi on --biosbootmenu disabled --rtcuseutc on
### minimal system
-#VBoxManage modifyvm      $RELEASE --memory 1024 --cpus 1
+VBoxManage modifyvm      $VMNAME --memory 1024 --cpus 1
### workstation class
-VBoxManage modifyvm      $RELEASE --memory 4096 --cpus 8 --ioapic on --vram 64 --usb on
+#VBoxManage modifyvm      $VMNAME --memory 4096 --cpus 8 --ioapic on --vram 64 --usb on
# rest of standard settings
-VBoxManage storagectl    $RELEASE --name "IDE Controller" --add ide --controller PIIX4
-VBoxManage storagectl    $RELEASE --name "SATA Controller" --add sata --controller IntelAhci
-VBoxManage storageattach $RELEASE --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium `pwd`/$RELEASE.iso
-VBoxManage createhd --filename $RELEASE.vdi --size 32768
-VBoxManage storageattach $RELEASE --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium $RELEASE.vdi
-VBoxManage modifyvm      $RELEASE --nic1 nat --nictype1 82540EM 
-VBoxManage modifyvm      $RELEASE --audio alsa
-VBoxManage startvm       $RELEASE
+VBoxManage storagectl    $VMNAME --name "IDE Controller" --add ide --controller PIIX4
+VBoxManage storagectl    $VMNAME --name "SATA Controller" --add sata --controller IntelAhci
+VBoxManage storageattach $VMNAME --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium `pwd`/$VMNAME.iso
+VBoxManage createhd --filename $VMNAME.vdi --size 32768
+VBoxManage storageattach $VMNAME --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium $VMNAME.vdi
+VBoxManage modifyvm      $VMNAME --nic1 nat --nictype1 82540EM 
+VBoxManage modifyvm      $VMNAME --natpf1 "ssh,tcp,,2222,,22"
+VBoxManage modifyvm      $VMNAME --audio alsa
+VBoxManage startvm       $VMNAME
File [added]: install_ET_2015_05
Delta lines: +27 -0
===================================================================
--- trunk/VirtualBox/install_ET_2015_05	                        (rev 0)
+++ trunk/VirtualBox/install_ET_2015_05	2015-05-09 16:56:55 UTC (rev 33)
@@ -0,0 +1,27 @@
+#!/bin/bash
+set -e
+
+# necessary for mpich, but not openmpi
+#perl -le 'printf "MPD_SECRETWORD=";print map { ("a".."z","A".."Z")[rand 52] } 1..40' > $HOME/.mpd.conf
+#chmod 600 $HOME/.mpd.conf
+
+RELEASE=ET_2015_05
+wget --no-check-certificate https://github.com/gridaphobe/CRL/raw/$RELEASE/GetComponents
+chmod +x GetComponents
+./GetComponents -p -a 
+cd Cactus
+
+# figure out how many cores we have
+logic_cores=`cat /proc/cpuinfo | grep "model name" | wc -l`
+fake_cores_per_core=`cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l`
+cores=$((($logic_cores-$fake_cores_per_core)/$fake_cores_per_core+1))
+
+./simfactory/bin/sim setup-silent --optionlist=debian.cfg --ppn=$cores --submitscript=debian.sub --runscript=without.run
+mkdir -p ~/simulations
+set +e
+time ./simfactory/bin/sim build --thornlist ./thornlists/einsteintoolkit.th 2>&1 | tee ET_build.log
+set -e
+make sim
+./simfactory/bin/sim create-run tests_1 --testsuite --procs 1
+./simfactory/bin/sim create-run tests_2 --testsuite --procs 2
+
File [modified]: install_ET_trunk
Delta lines: +4 -4
===================================================================
--- trunk/VirtualBox/install_ET_trunk	2014-01-30 21:41:51 UTC (rev 32)
+++ trunk/VirtualBox/install_ET_trunk	2015-05-09 16:56:55 UTC (rev 33)
@@ -4,12 +4,12 @@
 perl -le 'printf "MPD_SECRETWORD=";print map { ("a".."z","A".."Z")[rand 52] } 1..40' > $HOME/.mpd.conf
 chmod 600 $HOME/.mpd.conf
-wget --no-check-certificate https://github.com/gridaphobe/CRL/raw/master/GetComponents
+wget -c --no-check-certificate https://github.com/gridaphobe/CRL/raw/master/GetComponents
 chmod +x GetComponents
-./GetComponents -p -a http://svn.einsteintoolkit.org/manifest/trunk/einsteintoolkit.th
-mkdir ~/simulations
+./GetComponents -p -a https://bitbucket.org/einsteintoolkit/manifest/raw/master/einsteintoolkit.th
+mkdir -p ~/simulations
 cd Cactus
-./simfactory/bin/sim setup-silent --optionlist=debian.cfg --submitscript=debian.sub --runscript=without.run
+./simfactory/bin/sim setup-silent --optionlist=debian.cfg --submitscript=debian.sub
 ./simfactory/bin/sim build --thornlist=./thornlists/einsteintoolkit.th
 make sim
 ./simfactory/bin/sim create-submit tests_1 --testsuite --procs 1
File [modified]: postseed
Delta lines: +2 -0
===================================================================
--- trunk/VirtualBox/postseed	2014-01-30 21:41:51 UTC (rev 32)
+++ trunk/VirtualBox/postseed	2015-05-09 16:56:55 UTC (rev 33)
@@ -12,5 +12,7 @@
 chown -R et /home/et/misc
 chgrp -R et /home/et/misc
 chmod -R +w  /home/et/misc
+# give the system time to get network up
+sleep 5
 sudo -i -u et /home/et/misc/install_ET_* 2>&1 | tee /var/log/ET_install
 update-rc.d postseed remove
File [modified]: preseed.cfg
Delta lines: +1 -0
===================================================================
--- trunk/VirtualBox/preseed.cfg	2014-01-30 21:41:51 UTC (rev 32)
+++ trunk/VirtualBox/preseed.cfg	2015-05-09 16:56:55 UTC (rev 33)
@@ -35,6 +35,7 @@
 d-i partman/confirm boolean true
 d-i partman/confirm_nooverwrite boolean true
 d-i grub-installer/only_debian boolean true
+d-i grub-installer/bootdev string /dev/sda
 d-i finish-install/reboot_in_progress note
 tasksel tasksel/first multiselect
 d-i pkgsel/upgrade select full-upgrade

    