From 19fa6e547e2be2771f67577426164753bb8f2e5f Mon Sep 17 00:00:00 2001 From: Bernhard Gschaider Date: Wed, 4 Jun 2014 15:04:46 +0200 Subject: [PATCH 1/4] Extend minimum memory to 2.5 Gig because some tests are still failing --- vagrantSandbox/Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vagrantSandbox/Vagrantfile b/vagrantSandbox/Vagrantfile index 17d6d9b0e..8042f9b2f 100644 --- a/vagrantSandbox/Vagrantfile +++ b/vagrantSandbox/Vagrantfile @@ -25,8 +25,8 @@ Vagrant.configure("2") do |config| # # Use VBoxManage to customize the VM. For example to change memory: # vb.customize ["modifyvm", :id, "--memory", "1024"] vb.cpus=nrCPU - # make sure each CPU has enough memory (at least 1.5 Gig) - vb.memory=512*[(1+nrCPU),4].max + # make sure each CPU has enough memory (at least .5 Gig per CPU. 2.5 Gig Minimum to run the testHarness) + vb.memory=512*[(1+nrCPU),5].max end config.vm.define :trusty do |trusty| From 20344e2552dec63efb9d8d226f53e7078156f9e9 Mon Sep 17 00:00:00 2001 From: Bernhard Gschaider Date: Wed, 4 Jun 2014 15:07:25 +0200 Subject: [PATCH 2/4] Better hostnames. Got the name of the box and the host-computer. Code duplication. If someone finds out how to do this more elegantly I'll by him a drink of choice --- vagrantSandbox/Vagrantfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vagrantSandbox/Vagrantfile b/vagrantSandbox/Vagrantfile index 8042f9b2f..94e0985c5 100644 --- a/vagrantSandbox/Vagrantfile +++ b/vagrantSandbox/Vagrantfile @@ -4,7 +4,7 @@ Vagrant.configure("2") do |config| config.vm.synced_folder "..", "/FOAM-sources" - config.vm.hostname="vagrant"+ (ENV["HOSTNAME"] || `hostname`.strip) + config.vm.hostname="vagrant."+ (ENV["HOSTNAME"] || `hostname`.strip) nrCPU=1 if ENV["WM_VAGRANT_CPUS"] @@ -36,6 +36,7 @@ Vagrant.configure("2") do |config| s.args = "trusty" s.path = "initUbunutuScript.sh" end + trusty.vm.hostname="trusty."+config.vm.hostname end # default @@ -47,6 +48,7 @@ Vagrant.configure("2") do |config| s.args = "precise" s.path = "initUbunutuScript.sh" end + precise.vm.hostname="precise."+config.vm.hostname end config.vm.define :centos65 do |centos65| @@ -57,6 +59,7 @@ Vagrant.configure("2") do |config| s.args = "centos65" s.path = "initCentOSRHELScript.sh" end + centos65.vm.hostname="centos65."+config.vm.hostname end # legacy @@ -67,6 +70,7 @@ Vagrant.configure("2") do |config| s.args = "lucid" s.path = "initUbunutuScript.sh" end + lucid.vm.hostname="lucid."+config.vm.hostname end #legacy @@ -77,6 +81,7 @@ Vagrant.configure("2") do |config| s.args = "lucid" s.path = "initUbunutuScript.sh" end + maverick.vm.hostname="maverick."+config.vm.hostname end # experimental @@ -91,6 +96,7 @@ Vagrant.configure("2") do |config| end freebsd92.vm.synced_folder "..", "/FOAM-sources", type: "rsync", rsync__exclude: "vagrantSandbox/" freebsd92.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: "ccache4vm/" + freebsd92.vm.hostname="freebsd92."+config.vm.hostname end # legacy/experimental @@ -112,6 +118,8 @@ Vagrant.configure("2") do |config| # use NFS for the synced folder freebsd10.vm.synced_folder "..", "/FOAM-sources", :nfs => true + + freebsd10.vm.hostname="freebsd10."+config.vm.hostname end # legacy @@ -122,6 +130,7 @@ Vagrant.configure("2") do |config| s.args = "opensuse12" s.path = "initOpenSUSEScript.sh" end + opensuse12.vm.hostname="opensuse12."+config.vm.hostname end end From ffefae5261afc0ac4d7fbfb52c83867703e974d5 Mon Sep 17 00:00:00 2001 From: Bernhard Gschaider Date: Wed, 4 Jun 2014 18:02:15 +0200 Subject: [PATCH 3/4] Add OpenSUSE 13.1-box --- vagrantSandbox/README | 2 ++ vagrantSandbox/Vagrantfile | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/vagrantSandbox/README b/vagrantSandbox/README index 690c5dbc3..5040c0a3f 100644 --- a/vagrantSandbox/README +++ b/vagrantSandbox/README @@ -68,6 +68,8 @@ folders via NFS. Currently not working - opensuse12 :: OpenSUSE 12.3 machine. Currently not completely compiling Foam + - opensuse13 :: OpenSUSE 13.1 machine. The current LTS-version of + OpenSUSE Some machines (read: the BSD-boxes) need the =VirtualBox Extension Pack= installed (because they have USB 2.0) * Scripts in the machine diff --git a/vagrantSandbox/Vagrantfile b/vagrantSandbox/Vagrantfile index 94e0985c5..da7dcb844 100644 --- a/vagrantSandbox/Vagrantfile +++ b/vagrantSandbox/Vagrantfile @@ -133,4 +133,14 @@ Vagrant.configure("2") do |config| opensuse12.vm.hostname="opensuse12."+config.vm.hostname end + config.vm.define :opensuse13 do |opensuse13| + opensuse13.vm.box = "berendt/opensuse-13.1-x86_64" + opensuse13.vm.box_check_update = true + opensuse13.vm.provision :shell do |s| + s.args = "opensuse13" + s.path = "initOpenSUSEScript.sh" + end + opensuse13.vm.hostname="opensuse13."+config.vm.hostname + end + end From 11bac1b32985eaae89422d1ef378ed6ebd4591de Mon Sep 17 00:00:00 2001 From: Bernhard Gschaider Date: Wed, 4 Jun 2014 18:03:42 +0200 Subject: [PATCH 4/4] Make the OpenSUSE 13.1 box compile out of the box --- vagrantSandbox/initOpenSUSEScript.sh | 2 +- vagrantSandbox/skel/bootstrapFoam.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/vagrantSandbox/initOpenSUSEScript.sh b/vagrantSandbox/initOpenSUSEScript.sh index 89d5fb7b8..48bcc0cff 100755 --- a/vagrantSandbox/initOpenSUSEScript.sh +++ b/vagrantSandbox/initOpenSUSEScript.sh @@ -11,7 +11,7 @@ zypper -n remove patterns-openSUSE-minimal_base-conflicts # patterns-openSUSE-devel_python -neededPackages=(gcc-c++ mercurial git flex bison make ccache zlib-devel rpm-build binutils-devel) +neededPackages=(gcc-c++ mercurial git flex bison make ccache zlib-devel rpm-build binutils-devel cmake) bonusPackages=(emacs csh tcsh zsh) for p in ${neededPackages[@]}; do diff --git a/vagrantSandbox/skel/bootstrapFoam.sh b/vagrantSandbox/skel/bootstrapFoam.sh index ce3aaf55f..b85238396 100755 --- a/vagrantSandbox/skel/bootstrapFoam.sh +++ b/vagrantSandbox/skel/bootstrapFoam.sh @@ -15,6 +15,12 @@ cd $WM_THIRD_PARTY_DIR ./AllMake.stage0 2>&1 | tee $BOOTSTRAPLOG ./AllMake.stage1 2>&1 | tee --append $BOOTSTRAPLOG ./AllMake.stage2 2>&1 | tee --append $BOOTSTRAPLOG +source $WM_PROJECT_DIR/etc/bashrc +if [ ! -e $MPI_ARCH_PATH/lib ] +then + # OpenSUSE needs this + ln -s $MPI_ARCH_PATH/lib64 $MPI_ARCH_PATH/lib +fi ./AllMake.stage3 2>&1 | tee --append $BOOTSTRAPLOG cd $WM_PROJECT_DIR