[mapguide-commits] r8409 - in trunk/Tools/Vagrant: . centos/x64 packer packer/http packer/http/centos-6.5 packer/http/ubuntu packer/http/ubuntu-12.04.5 packer/http/ubuntu-14.04 packer/scripts packer/scripts/centos packer/scripts/centos-6.5 packer/scripts/common packer/scripts/mapguide packer/scripts/ubuntu scripts ubuntu/x64 ubuntu/x86

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Oct 17 02:38:28 PDT 2014 

Author: jng
Date: 2014-10-17 02:38:28 -0700 (Fri, 17 Oct 2014)
New Revision: 8409

Added:
   trunk/Tools/Vagrant/packer/http/
   trunk/Tools/Vagrant/packer/http/centos-6.5/
   trunk/Tools/Vagrant/packer/http/centos-6.5/anaconda-ks.cfg
   trunk/Tools/Vagrant/packer/http/ubuntu-12.04.5/
   trunk/Tools/Vagrant/packer/http/ubuntu-12.04.5/preseed.cfg
   trunk/Tools/Vagrant/packer/http/ubuntu-14.04/
   trunk/Tools/Vagrant/packer/http/ubuntu-14.04/preseed.cfg
   trunk/Tools/Vagrant/packer/http/ubuntu/
   trunk/Tools/Vagrant/packer/http/ubuntu/preseed.cfg
   trunk/Tools/Vagrant/packer/scripts/
   trunk/Tools/Vagrant/packer/scripts/centos-6.5/
   trunk/Tools/Vagrant/packer/scripts/centos-6.5/base.sh
   trunk/Tools/Vagrant/packer/scripts/centos-6.5/cleanup.sh
   trunk/Tools/Vagrant/packer/scripts/centos/
   trunk/Tools/Vagrant/packer/scripts/centos/virtualbox.sh
   trunk/Tools/Vagrant/packer/scripts/common/
   trunk/Tools/Vagrant/packer/scripts/common/minimize.sh
   trunk/Tools/Vagrant/packer/scripts/common/sshd.sh
   trunk/Tools/Vagrant/packer/scripts/common/vagrant.sh
   trunk/Tools/Vagrant/packer/scripts/mapguide/
   trunk/Tools/Vagrant/packer/scripts/mapguide/centos32.sh
   trunk/Tools/Vagrant/packer/scripts/mapguide/centos64.sh
   trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh
   trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh
   trunk/Tools/Vagrant/packer/scripts/ubuntu/
   trunk/Tools/Vagrant/packer/scripts/ubuntu/base.sh
   trunk/Tools/Vagrant/packer/scripts/ubuntu/cleanup.sh
   trunk/Tools/Vagrant/packer/scripts/ubuntu/virtualbox.sh
   trunk/Tools/Vagrant/packer/ubuntu12-amd64.json
   trunk/Tools/Vagrant/packer/ubuntu12-i386.json
Modified:
   trunk/Tools/Vagrant/build.bat
   trunk/Tools/Vagrant/centos/x64/Vagrantfile
   trunk/Tools/Vagrant/make_boxes.bat
   trunk/Tools/Vagrant/packer/
   trunk/Tools/Vagrant/scripts/mapguidecommon_excludes.txt
   trunk/Tools/Vagrant/scripts/mginstallcentos.sh
   trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile
   trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile
Log:
Vagrant build system updates:
 - Add Ubuntu 12.04.5 packer configurations for 32-bit and 64-bit
 - Add missing packer scripts and pre-seed configurations
 - Update make_boxes.bat to create all boxes (now that we have all packer configs)
 - Update mginstallcentos.sh
   - Install extra dependencies to ensure MapGuide works from a minimal install and that we can extract .tar.xz tarballs
 - Update mapguidecommon exclude list with updated DWF Toolkit .so files
 - Ensure arch variables are substituted in mginstallcentos.sh for x64 CentOS build
 - Ubuntu Vagrantfile updates
   - Use packer-built VM names
   - Add MappingService to server test suites to run
   - Ensure arch variables are substituted in mginstallubuntu.sh for x64 Ubuntu build

Modified: trunk/Tools/Vagrant/build.bat
===================================================================
--- trunk/Tools/Vagrant/build.bat	2014-10-17 09:36:26 UTC (rev 8408)
+++ trunk/Tools/Vagrant/build.bat	2014-10-17 09:38:28 UTC (rev 8409)
@@ -8,12 +8,12 @@
 rem on the package FDO SDK tarball produced by the CentOS build
 
 SET BUILD_UBUNTU_32=1
-SET BUILD_UBUNTU_64=0
-SET BUILD_CENTOS_32=1
+SET BUILD_UBUNTU_64=1
+SET BUILD_CENTOS_32=0
 SET BUILD_CENTOS_64=0
 SET TEARDOWN_UBUNTU_32=1
-SET TEARDOWN_UBUNTU_64=0
-SET TEARDOWN_CENTOS_32=1
+SET TEARDOWN_UBUNTU_64=1
+SET TEARDOWN_CENTOS_32=0
 SET TEARDOWN_CENTOS_64=0
 SET ROOT=%CD%
 SET COMPONENT=

Modified: trunk/Tools/Vagrant/centos/x64/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/centos/x64/Vagrantfile	2014-10-17 09:36:26 UTC (rev 8408)
+++ trunk/Tools/Vagrant/centos/x64/Vagrantfile	2014-10-17 09:38:28 UTC (rev 8409)
@@ -327,6 +327,8 @@
 sudo cp /vagrant/mginstallcentos.sh /vagrant/build/mginstallcentos.sh
 sudo sed -i 's/FDOVER_REV=0/FDOVER_REV='"$FDO_REV"'/g' /vagrant/build/mginstallcentos.sh
 sudo sed -i 's/MGVER_REV=0/MGVER_REV='"$MG_REV"'/g' /vagrant/build/mginstallcentos.sh
+sudo sed -i 's/FDO_ARCH=i386/FDO_ARCH=amd64/g' /vagrant/build/mginstallcentos.sh
+sudo sed -i 's/MG_ARCH=i386/MG_ARCH=amd64/g' /vagrant/build/mginstallcentos.sh
 if [ ! -d /mapguide_sources/updated ]; then
     sudo mkdir -p /mapguide_sources/updated
     cd $MG_SRC_ROOT

Modified: trunk/Tools/Vagrant/make_boxes.bat
===================================================================
--- trunk/Tools/Vagrant/make_boxes.bat	2014-10-17 09:36:26 UTC (rev 8408)
+++ trunk/Tools/Vagrant/make_boxes.bat	2014-10-17 09:38:28 UTC (rev 8409)
@@ -1,6 +1,6 @@
 @echo off
-SET BUILD_UBUNTU_32=0
-SET BUILD_UBUNTU_64=0
+SET BUILD_UBUNTU_32=1
+SET BUILD_UBUNTU_64=1
 SET BUILD_CENTOS_32=1
 SET BUILD_CENTOS_64=1
 pushd packer


Property changes on: trunk/Tools/Vagrant/packer
___________________________________________________________________
Modified: svn:ignore
   - *.box

   + *.box
packer_cache


Added: trunk/Tools/Vagrant/packer/http/centos-6.5/anaconda-ks.cfg
===================================================================
--- trunk/Tools/Vagrant/packer/http/centos-6.5/anaconda-ks.cfg	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/http/centos-6.5/anaconda-ks.cfg	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,45 @@
+install
+text
+reboot
+cdrom
+lang en_US.UTF-8
+keyboard us
+timezone --utc Etc/UTC
+rootpw --plaintext vagrant
+zerombr
+clearpart --all
+part /boot --size=200
+part swap --recommended
+part / --size=1 --grow
+bootloader
+
+%packages --nobase
+ at core
+-b43-openfwwf
+-device-mapper-multipath
+-efibootmgr
+-iscsi-initiator-utils
+-lvm2
+-mdadm
+%end
+
+%post --erroronfail
+yum -y update
+
+useradd -m -U vagrant
+echo 'vagrant' | passwd --stdin vagrant
+cat <<EOF > /etc/sudoers.d/vagrant
+Defaults:vagrant !requiretty
+vagrant ALL=(ALL) NOPASSWD: ALL
+EOF
+chmod 440 /etc/sudoers.d/vagrant
+
+rm /etc/udev/rules.d/70-persistent-net.rules
+ln -s /dev/null /etc/udev/rules.d/75-persistent-net-generator.rules
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 <<EOF
+DEVICE="eth0"
+BOOTPROTO="dhcp"
+ONBOOT="yes"
+TYPE="Ethernet"
+EOF
+%end

Added: trunk/Tools/Vagrant/packer/http/ubuntu/preseed.cfg
===================================================================
--- trunk/Tools/Vagrant/packer/http/ubuntu/preseed.cfg	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/http/ubuntu/preseed.cfg	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,51 @@
+d-i debian-installer/locale string en_US
+d-i time/zone string UTC
+
+d-i keyboard-configuration/xkb-keymap select us
+
+d-i partman-auto/method string regular
+d-i partman-auto/expert_recipe string \
+        scheme ::                     \
+        200 0 200 ext4                \
+                $primary{ }           \
+                $bootable{ }          \
+                method{ format }      \
+                format{ }             \
+                use_filesystem{ }     \
+                filesystem{ ext4 }    \
+                mountpoint{ /boot } . \
+        200% 0 200% linux-swap        \
+                $primary{ }           \
+                method{ swap }        \
+                format{ } .           \
+        1 0 -1 ext4                   \
+                $primary{ }           \
+                method{ format }      \
+                format{ }             \
+                use_filesystem{ }     \
+                filesystem{ ext4 }    \
+                mountpoint{ / } .
+d-i partman-partitioning/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+
+d-i base-installer/excludes string laptop-detect
+
+d-i passwd/root-password-again password vagrant
+d-i passwd/root-password password vagrant
+d-i passwd/user-fullname string vagrant
+d-i passwd/username string vagrant
+d-i passwd/user-password password vagrant
+d-i passwd/user-password-again password vagrant
+d-i user-setup/allow-password-weak boolean true
+
+d-i pkgsel/include string aptitude curl openssh-server sudo
+d-i pkgsel/language-packs multiselect
+
+d-i finish-install/reboot_in_progress note
+
+d-i preseed/early_command string                                                                                                                \
+        mkdir -p /usr/lib/post-base-installer.d &&                                                                                              \
+        echo "sed -i -e 's/^in-target.*tasksel.*/#\\0/' /var/lib/dpkg/info/pkgsel.postinst" > /usr/lib/post-base-installer.d/90skip-tasksel &&  \
+        chmod +x /usr/lib/post-base-installer.d/90skip-tasksel

Added: trunk/Tools/Vagrant/packer/http/ubuntu-12.04.5/preseed.cfg
===================================================================
--- trunk/Tools/Vagrant/packer/http/ubuntu-12.04.5/preseed.cfg	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/http/ubuntu-12.04.5/preseed.cfg	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,6 @@
+d-i preseed/include string ../ubuntu/preseed.cfg
+
+d-i preseed/late_command string                                                   \
+        echo 'Defaults:vagrant !requiretty' > /target/etc/sudoers.d/vagrant;      \
+        echo 'vagrant ALL=(ALL) NOPASSWD: ALL' >> /target/etc/sudoers.d/vagrant;  \
+        chmod 440 /target/etc/sudoers.d/vagrant

Added: trunk/Tools/Vagrant/packer/http/ubuntu-14.04/preseed.cfg
===================================================================
--- trunk/Tools/Vagrant/packer/http/ubuntu-14.04/preseed.cfg	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/http/ubuntu-14.04/preseed.cfg	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,6 @@
+d-i preseed/include string ../ubuntu/preseed.cfg
+
+d-i preseed/late_command string                                                   \
+        echo 'Defaults:vagrant !requiretty' > /target/etc/sudoers.d/vagrant;      \
+        echo 'vagrant ALL=(ALL) NOPASSWD: ALL' >> /target/etc/sudoers.d/vagrant;  \
+        chmod 440 /target/etc/sudoers.d/vagrant

Added: trunk/Tools/Vagrant/packer/scripts/centos/virtualbox.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/centos/virtualbox.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/centos/virtualbox.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+set -x
+
+sudo yum -y --enablerepo=epel install dkms
+sudo yum -y install make
+sudo yum -y install perl
+
+# Uncomment this if you want to install Guest Additions with support for X
+#sudo yum -y install xorg-x11-server-Xorg
+
+sudo mount -o loop ~/VBoxGuestAdditions.iso /mnt/
+sudo /mnt/VBoxLinuxAdditions.run || :
+sudo umount /mnt/
+rm -f ~/VBoxGuestAdditions.iso

Added: trunk/Tools/Vagrant/packer/scripts/centos-6.5/base.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/centos-6.5/base.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/centos-6.5/base.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+set -x
+
+sudo yum -y install https://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
+sudo sed -i -e 's/^enabled=1/enabled=0/' /etc/yum.repos.d/epel.repo
+
+sudo sed -i -e 's,^ACTIVE_CONSOLES=.*$,ACTIVE_CONSOLES=/dev/tty1,' /etc/sysconfig/init

Added: trunk/Tools/Vagrant/packer/scripts/centos-6.5/cleanup.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/centos-6.5/cleanup.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/centos-6.5/cleanup.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+set -x
+
+sudo yum clean all
+sudo yum history new
+sudo truncate -c -s 0 /var/log/yum.log

Added: trunk/Tools/Vagrant/packer/scripts/common/minimize.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/common/minimize.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/common/minimize.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+set -x
+
+dd if=/dev/zero of=EMPTY bs=1M || :
+rm EMPTY

Added: trunk/Tools/Vagrant/packer/scripts/common/sshd.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/common/sshd.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/common/sshd.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+set -x
+
+sudo tee -a /etc/ssh/sshd_config <<EOF
+
+UseDNS no
+EOF

Added: trunk/Tools/Vagrant/packer/scripts/common/vagrant.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/common/vagrant.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/common/vagrant.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+set -x
+
+date | sudo tee /etc/vagrant_box_build_time
+
+mkdir -p ~/.ssh
+curl -fsSLo ~/.ssh/authorized_keys https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub
+chmod 700 ~/.ssh/
+chmod 600 ~/.ssh/authorized_keys
+
+if [ -f /etc/sudoers ] ; then
+    sudo sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
+    sudo sed -i "s/^\(.*env_keep = \"\)/\1PATH /" /etc/sudoers
+    sudo sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers
+    sudo sed -i -e 's/%sudo.*ALL=.*ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers
+fi
\ No newline at end of file

Added: trunk/Tools/Vagrant/packer/scripts/mapguide/centos32.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/mapguide/centos32.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/mapguide/centos32.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,5 @@
+#!/bin/bash
+sudo yum install -y gcc make gcc-c++ gd-* automake bison byacc flex doxygen expat expat-devel libtool libjpeg-devel libpng libpng-devel libxml2 libxml2-devel openssl curl curl-devel libxslt libxslt-devel subversion java-1.7.0-openjdk java-1.7.0-openjdk-devel ant dos2unix openssh-server openldap-devel alsa-lib-devel pcre-devel unixODBC-devel libcom_err-devel krb5-devel openssl-devel mysql-devel postgresql-devel unixODBC
+# For producing .tar.xz archives
+sudo yum install -y xz-lzma-compat
+echo "JAVA_HOME=/usr/lib/jvm/java-openjdk" | sudo tee --append /etc/environment
\ No newline at end of file

Added: trunk/Tools/Vagrant/packer/scripts/mapguide/centos64.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/mapguide/centos64.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/mapguide/centos64.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,7 @@
+#!/bin/bash
+sudo yum install -y gcc make gcc-c++ gd-* automake bison byacc flex doxygen expat expat-devel libtool libjpeg-devel libpng libpng-devel libxml2 libxml2-devel openssl curl curl-devel libxslt libxslt-devel subversion java-1.7.0-openjdk java-1.7.0-openjdk-devel ant dos2unix openssh-server openldap-devel alsa-lib-devel pcre-devel unixODBC-devel libcom_err-devel krb5-devel openssl-devel mysql-devel postgresql-devel unixODBC
+# For producing .tar.xz archives
+sudo yum install -y xz-lzma-compat
+# For 32-bit swig binary in MapGuide source
+sudo yum install -y libstdc++.i686 glibc.i686
+echo "JAVA_HOME=/usr/lib/jvm/java-openjdk" | sudo tee --append /etc/environment
\ No newline at end of file

Added: trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Set bash as the default shell
+echo "dash    dash/sh boolean false" | sudo debconf-set-selections
+sudo dpkg-reconfigure --frontend=noninteractive dash
+# Guard against (http://askubuntu.com/questions/41605/trouble-downloading-updates-due-to-a-hash-sum-mismatch-error)
+sudo rm -rf /var/lib/apt/lists/*
+sudo apt-get update
+sudo apt-get install -y build-essential bison automake libtool libpng-dev libjpeg62-dev libxslt-dev libfreetype6-dev libpcre3-dev openjdk-7-jdk subversion lintian ant scons dos2unix liboss4-salsa-dev libldap-dev libssl-dev libcurl4-openssl-dev libexpat-dev libmysqlclient-dev unixODBC-dev python-dev libpq-dev libcppunit-dev
+# For producing .tar.xz archives
+sudo apt-get install -y xz-utils
+# For deb packaging
+sudo apt-get install -y rsync
+echo "JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-i386" | sudo tee --append /etc/environment
\ No newline at end of file

Added: trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Set bash as the default shell
+echo "dash    dash/sh boolean false" | sudo debconf-set-selections
+sudo dpkg-reconfigure --frontend=noninteractive dash
+# Guard against (http://askubuntu.com/questions/41605/trouble-downloading-updates-due-to-a-hash-sum-mismatch-error)
+sudo rm -rf /var/lib/apt/lists/*
+sudo apt-get update
+sudo apt-get install -y build-essential bison automake libtool libpng-dev libjpeg62-dev libxslt-dev libfreetype6-dev libpcre3-dev openjdk-7-jdk subversion lintian ant scons dos2unix liboss4-salsa-dev libldap-dev libssl-dev libcurl4-openssl-dev libexpat-dev libmysqlclient-dev unixODBC-dev python-dev libpq-dev libcppunit-dev
+# For producing .tar.xz archives
+sudo apt-get install -y xz-utils
+# For deb packaging
+sudo apt-get install -y rsync
+# For 32-bit swig binary in MapGuide source
+sudo apt-get install -y g++-multilib
+echo "JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64" | sudo tee --append /etc/environment
\ No newline at end of file

Added: trunk/Tools/Vagrant/packer/scripts/ubuntu/base.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/ubuntu/base.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/ubuntu/base.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+set -x
+
+sudo sed -i -e 's,^\(ACTIVE_CONSOLES="/dev/tty\).*,\11",' /etc/default/console-setup
+for f in /etc/init/tty[^1]*.conf; do
+  sudo mv "$f"{,.bak}
+done

Added: trunk/Tools/Vagrant/packer/scripts/ubuntu/cleanup.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/ubuntu/cleanup.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/ubuntu/cleanup.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+set -x
+
+sudo aptitude -y clean

Added: trunk/Tools/Vagrant/packer/scripts/ubuntu/virtualbox.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/ubuntu/virtualbox.sh	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/scripts/ubuntu/virtualbox.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+set -x
+
+sudo aptitude -y install dkms
+sudo aptitude -y install make
+
+# Uncomment this if you want to install Guest Additions with support for X
+#sudo aptitude -y install xserver-xorg
+
+sudo mount -o loop ~/VBoxGuestAdditions.iso /mnt/
+sudo /mnt/VBoxLinuxAdditions.run || :
+sudo umount /mnt/
+rm -f ~/VBoxGuestAdditions.iso
+
+VBOX_VERSION=$(cat ~/.vbox_version)
+if [ "$VBOX_VERSION" == '4.3.10' ]; then
+  # https://www.virtualbox.org/ticket/12879
+  sudo ln -s "/opt/VBoxGuestAdditions-$VBOX_VERSION/lib/VBoxGuestAdditions" /usr/lib/VBoxGuestAdditions
+fi

Added: trunk/Tools/Vagrant/packer/ubuntu12-amd64.json
===================================================================
--- trunk/Tools/Vagrant/packer/ubuntu12-amd64.json	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/ubuntu12-amd64.json	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,57 @@
+{
+  "builders": [{
+    "type": "virtualbox-iso",
+    "guest_os_type": "Ubuntu_64",
+    "iso_url": "http://mirror.internode.on.net.au/pub/ubuntu/releases/12.04/ubuntu-12.04.5-server-amd64.iso",
+    "iso_checksum": "769474248a3897f4865817446f9a4a53",
+    "iso_checksum_type": "md5",
+    "output_directory": "output-ubuntu-12.04.5-amd64",
+    "vm_name": "packer-ubuntu-12.04.5-amd64",
+    "disk_size": "{{user `disk_size`}}",
+    "headless": "{{user `headless`}}",
+    "http_directory": "http",
+    "boot_wait": "5s",
+    "boot_command": [
+      "<esc><wait>",
+      "<esc><wait>",
+      "<enter><wait>",
+      "install ",
+      "auto-install/enable=true ",
+      "debconf/priority=critical ",
+      "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu-12.04.5/preseed.cfg ",
+      "<enter>"
+    ],
+    "ssh_wait_timeout": "60m",
+    "ssh_username": "vagrant",
+    "ssh_password": "vagrant",
+    "shutdown_command": "sudo poweroff",
+    "vboxmanage": [
+      ["modifyvm", "{{.Name}}", "--memory", "{{user `memory`}}"],
+      ["modifyvm", "{{.Name}}", "--cpus", "{{user `cpus`}}"]
+    ]
+  }],
+  "provisioners": [{
+    "type": "shell",
+    "scripts": [
+      "scripts/ubuntu/base.sh",
+      "scripts/ubuntu/virtualbox.sh",
+      "scripts/common/vagrant.sh",
+      "scripts/common/sshd.sh",
+      "scripts/mapguide/ubuntu64.sh",
+      "scripts/ubuntu/cleanup.sh",
+      "scripts/common/minimize.sh"
+    ]
+  }],
+  "post-processors": [{
+    "type": "vagrant",
+    "compression_level": "{{user `compression_level`}}",
+    "output": "ubuntu12-amd64.box"
+  }],
+  "variables": {
+    "compression_level": 1,
+    "cpus": "2",
+    "disk_size": 25000,
+    "headless": false,
+    "memory": "1024"
+  }
+}

Added: trunk/Tools/Vagrant/packer/ubuntu12-i386.json
===================================================================
--- trunk/Tools/Vagrant/packer/ubuntu12-i386.json	                        (rev 0)
+++ trunk/Tools/Vagrant/packer/ubuntu12-i386.json	2014-10-17 09:38:28 UTC (rev 8409)
@@ -0,0 +1,57 @@
+{
+  "builders": [{
+    "type": "virtualbox-iso",
+    "guest_os_type": "Ubuntu",
+    "iso_url": "http://mirror.internode.on.net.au/pub/ubuntu/releases/12.04/ubuntu-12.04.5-server-i386.iso",
+    "iso_checksum": "1214cd22448338b60bb24f583dd8741a",
+    "iso_checksum_type": "md5",
+    "output_directory": "output-ubuntu-12.04.5-i386",
+    "vm_name": "packer-ubuntu-12.04.5-i386",
+    "disk_size": "{{user `disk_size`}}",
+    "headless": "{{user `headless`}}",
+    "http_directory": "http",
+    "boot_wait": "5s",
+    "boot_command": [
+      "<esc><wait>",
+      "<esc><wait>",
+      "<enter><wait>",
+      "install ",
+      "auto-install/enable=true ",
+      "debconf/priority=critical ",
+      "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu-12.04.5/preseed.cfg ",
+      "<enter>"
+    ],
+    "ssh_wait_timeout": "60m",
+    "ssh_username": "vagrant",
+    "ssh_password": "vagrant",
+    "shutdown_command": "sudo poweroff",
+    "vboxmanage": [
+      ["modifyvm", "{{.Name}}", "--memory", "{{user `memory`}}"],
+      ["modifyvm", "{{.Name}}", "--cpus", "{{user `cpus`}}"]
+    ]
+  }],
+  "provisioners": [{
+    "type": "shell",
+    "scripts": [
+      "scripts/ubuntu/base.sh",
+      "scripts/ubuntu/virtualbox.sh",
+      "scripts/common/vagrant.sh",
+      "scripts/common/sshd.sh",
+      "scripts/mapguide/ubuntu32.sh",
+      "scripts/ubuntu/cleanup.sh",
+      "scripts/common/minimize.sh"
+    ]
+  }],
+  "post-processors": [{
+    "type": "vagrant",
+    "compression_level": "{{user `compression_level`}}",
+    "output": "ubuntu12-i386.box"
+  }],
+  "variables": {
+    "compression_level": 1,
+    "cpus": "2",
+    "disk_size": 25000,
+    "headless": false,
+    "memory": "1024"
+  }
+}

Modified: trunk/Tools/Vagrant/scripts/mapguidecommon_excludes.txt
===================================================================
--- trunk/Tools/Vagrant/scripts/mapguidecommon_excludes.txt	2014-10-17 09:36:26 UTC (rev 8408)
+++ trunk/Tools/Vagrant/scripts/mapguidecommon_excludes.txt	2014-10-17 09:38:28 UTC (rev 8409)
@@ -1,8 +1,7 @@
 libACE.so
-libACE.so.5.8.0
-libdwfcore-1.1.1.so
-libdwfemap-1.0.0.so
-libdwftk-7.1.1.so
+libACE.so.6.2.6
+libdwfcore-1.7.0.so
+libdwftk-7.7.0.so
 libMgFoundation-3.0.0.so
 libMgFoundation.so
 libMgGeometry-3.0.0.so

Modified: trunk/Tools/Vagrant/scripts/mginstallcentos.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/mginstallcentos.sh	2014-10-17 09:36:26 UTC (rev 8408)
+++ trunk/Tools/Vagrant/scripts/mginstallcentos.sh	2014-10-17 09:38:28 UTC (rev 8409)
@@ -18,24 +18,22 @@
 MG_URL=${URL}/${MG_TARBALL}
 FDO_URL=${URL}/${FDO_TARBALL}
 
+# Must make sure we have .tar.xz support and any other deps if this is a minimal install
+yum install -y xz-lzma-compat wget libxslt libpng 
+
 # Must have root
 if [[ $EUID -ne 0 ]]; then
     echo "You must run this script with superuser privileges"
     exit 1
 fi
 
-if [ ! -f ${FDO_TARBALL} ]; then
-wget -N ${FDO_URL}
-fi
+wget -N -c ${FDO_URL}
 
-#tar -C / -zxvf ${FDO_TARBALL}
 mkdir -p /usr/local/fdo-${FDOVER_MAJOR_MINOR_REV}
 echo "[install]: Extracting FDO"
 tar -C /usr/local/fdo-${FDOVER_MAJOR_MINOR_REV}/ -Jxf ${FDO_TARBALL}
 
-if [ ! -f ${MG_TARBALL} ]; then
-wget -N ${MG_URL}
-fi
+wget -N -c ${MG_URL}
 
 echo "[install]: Extracting MapGuide"
 tar -C / -Jxf ${MG_TARBALL}

Modified: trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile	2014-10-17 09:36:26 UTC (rev 8408)
+++ trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile	2014-10-17 09:38:28 UTC (rev 8409)
@@ -10,7 +10,7 @@
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "vagrant-precise64"
+  config.vm.box = "ubuntu12-amd64"
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.
@@ -196,8 +196,6 @@
     sudo mkdir -p /usr/include/asm
     sudo cp /mapguide_sources/atomic.h /usr/include/asm
 fi
-#echo [provision]: Checking libraries
-#sudo apt-get install -y libpq-dev libmysqlclient-dev
 echo [provision]: Clean line endings
 sudo dos2unix /vagrant/*.sh
 sudo dos2unix /vagrant/*.pl
@@ -346,7 +344,7 @@
     cd $SCRIPT_ROOT/mgdev/Server/src/Core
     sudo make unittest.sh
     # Run the test suites individually except for TileService for reasons already stated
-    for comp in CoordinateSystem FeatureService Geometry KmlService LogManager MdfModel Misc RenderingService ServerAdminService ServerManager ServiceManager SiteManager SiteService ProfilingService TransformMesh
+    for comp in CoordinateSystem FeatureService Geometry KmlService LogManager MappingService MdfModel Misc Performance RenderingService ServerAdminService ServerManager ServiceManager SiteManager SiteService ProfilingService TransformMesh
     do
         sudo -E ./mgserver test $comp UnitTestResults_${comp}.xml 2>&1 | tee ~/mapguide_${comp}_unit_test.log
         check_test
@@ -370,6 +368,8 @@
 sudo cp /vagrant/mginstallubuntu.sh /vagrant/build/mginstallubuntu.sh
 sudo sed -i 's/FDOBUILD=0/FDOBUILD='"$FDO_REV"'/g' /vagrant/build/mginstallubuntu.sh
 sudo sed -i 's/MGBUILD=0/MGBUILD='"$MG_REV"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/FDOARCH=i386/FDOARCH=amd64/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/MGARCH=i386/MGARCH=amd64/g' /vagrant/build/mginstallubuntu.sh
 # Do not update the working copy tarballs. Ubuntu 14.04 uses svn 1.8 which will break
 # the working copy if copied over to a CentOS VM (which is still on 1.6)
 #

Modified: trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile	2014-10-17 09:36:26 UTC (rev 8408)
+++ trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile	2014-10-17 09:38:28 UTC (rev 8409)
@@ -10,7 +10,7 @@
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "vagrant-precise32"
+  config.vm.box = "ubuntu12-i386"
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.
@@ -196,8 +196,6 @@
     sudo mkdir -p /usr/include/asm
     sudo cp /mapguide_sources/atomic.h /usr/include/asm
 fi
-#echo [provision]: Checking libraries
-#sudo apt-get install -y libpq-dev libmysqlclient-dev
 echo [provision]: Clean line endings
 sudo dos2unix /vagrant/*.sh
 sudo dos2unix /vagrant/*.pl
@@ -346,7 +344,7 @@
     cd $SCRIPT_ROOT/mgdev/Server/src/Core
     sudo make unittest.sh
     # Run the test suites individually except for TileService for reasons already stated
-    for comp in CoordinateSystem FeatureService Geometry KmlService LogManager MdfModel Misc RenderingService ServerAdminService ServerManager ServiceManager SiteManager SiteService ProfilingService TransformMesh
+    for comp in CoordinateSystem FeatureService Geometry KmlService LogManager MappingService MdfModel Misc Performance RenderingService ServerAdminService ServerManager ServiceManager SiteManager SiteService ProfilingService TransformMesh
     do
         sudo -E ./mgserver test $comp UnitTestResults_${comp}.xml 2>&1 | tee ~/mapguide_${comp}_unit_test.log
         check_test

More information about the mapguide-commits mailing list