[mapguide-commits] r8606 - in branches/3.0/vagrant: . centos/test_x64 centos/test_x86 centos/x64 centos/x86 ubuntu/test_x64 ubuntu/test_x86 ubuntu/x64 ubuntu/x86
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Mar 29 08:10:47 PDT 2015
Author: jng
Date: 2015-03-29 08:10:47 -0700 (Sun, 29 Mar 2015)
New Revision: 8606
Modified:
branches/3.0/vagrant/build.bat
branches/3.0/vagrant/centos/test_x64/Vagrantfile
branches/3.0/vagrant/centos/test_x64/provision.sh
branches/3.0/vagrant/centos/test_x86/Vagrantfile
branches/3.0/vagrant/centos/test_x86/provision.sh
branches/3.0/vagrant/centos/x64/Vagrantfile
branches/3.0/vagrant/centos/x86/Vagrantfile
branches/3.0/vagrant/ubuntu/test_x64/Vagrantfile
branches/3.0/vagrant/ubuntu/test_x64/provision.sh
branches/3.0/vagrant/ubuntu/test_x86/Vagrantfile
branches/3.0/vagrant/ubuntu/test_x86/provision.sh
branches/3.0/vagrant/ubuntu/x64/Vagrantfile
branches/3.0/vagrant/ubuntu/x86/Vagrantfile
branches/3.0/vagrant/verify.bat
Log:
#2520: This submission contains the following changes:
- Fix FDO build paths for FDO 4.0
- Update smoke test vagrantfiles to allow for parameterized download host URLs, which is now specified in verify.bat
- Disable FDO and MapGuide unit tests in our main vagrantfiles. This should happen in separate vagrantfiles
Modified: branches/3.0/vagrant/build.bat
===================================================================
--- branches/3.0/vagrant/build.bat 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/build.bat 2015-03-29 15:10:47 UTC (rev 8606)
@@ -82,7 +82,8 @@
echo [build]: Generate MD5 hashes
pushd %ROOT%\builds\centos_x86
if exist md5sums.txt del md5sums.txt
-md5sum *.* | tee md5sums.txt
+md5sum *.sh > md5sums.txt
+md5sum *.tar.xz >> md5sums.txt
popd
if %TEARDOWN_CENTOS_32% == 1 (
echo [build]: Tearing down CentOS 32 VM
@@ -116,7 +117,8 @@
echo [build]: Generate MD5 hashes
pushd %ROOT%\builds\ubuntu_x86
if exist md5sums.txt del md5sums.txt
-md5sum *.* | tee md5sums.txt
+md5sum *.sh > md5sums.txt
+md5sum *.deb >> md5sums.txt
popd
if %TEARDOWN_UBUNTU_32% == 1 (
echo [build]: Tearing down Ubuntu 32 VM
@@ -150,7 +152,8 @@
echo [build]: Generate MD5 hashes
pushd %ROOT%\builds\centos_x64
if exist md5sums.txt del md5sums.txt
-md5sum *.* | tee md5sums.txt
+md5sum *.sh > md5sums.txt
+md5sum *.tar.xz >> md5sums.txt
popd
if %TEARDOWN_CENTOS_64% == 1 (
echo [build]: Tearing down CentOS 64 VM
@@ -184,7 +187,8 @@
echo [build]: Generate MD5 hashes
pushd %ROOT%\builds\ubuntu_x64
if exist md5sums.txt del md5sums.txt
-md5sum *.* | tee md5sums.txt
+md5sum *.sh > md5sums.txt
+md5sum *.deb >> md5sums.txt
popd
if %TEARDOWN_UBUNTU_64% == 1 (
echo [build]: Tearing down Ubuntu 64 VM
Modified: branches/3.0/vagrant/centos/test_x64/Vagrantfile
===================================================================
--- branches/3.0/vagrant/centos/test_x64/Vagrantfile 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/centos/test_x64/Vagrantfile 2015-03-29 15:10:47 UTC (rev 8606)
@@ -119,5 +119,5 @@
config.vm.provision "shell",
privileged: false,
path: "provision.sh",
- args: "#{ENV['DOWNLOAD_HOST']}"
+ args: ["#{ENV['DOWNLOAD_HOST']}", "#{ENV['MG_DIST_DIR']}"]
end
Modified: branches/3.0/vagrant/centos/test_x64/provision.sh
===================================================================
--- branches/3.0/vagrant/centos/test_x64/provision.sh 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/centos/test_x64/provision.sh 2015-03-29 15:10:47 UTC (rev 8606)
@@ -1,13 +1,14 @@
#!/bin/bash
DOWNLOAD_HOST=$1
+URI_PART=$2
+DIST_DIR="centos_x64"
sudo yum install -y wget
echo Download host is: $DOWNLOAD_HOST
-wget "http://$DOWNLOAD_HOST/builds/Sheboygan.mgp"
-wget "http://$DOWNLOAD_HOST/builds/smoke_test.sh"
+wget "http://$DOWNLOAD_HOST/$URI_PART/Sheboygan.mgp"
+wget "http://$DOWNLOAD_HOST/$URI_PART/smoke_test.sh"
sudo mv Sheboygan.mgp /tmp/
-wget "http://$DOWNLOAD_HOST/builds/centos_x64/mginstallcentos.sh"
-sed -i 's/URL="http:\/\/download/URL_OLD="http:\/\/download/g' mginstallcentos.sh
-sed -i 's/#URL="http:\/\/192.168.0.4\/downloads"/URL="http:\/\/'"$DOWNLOAD_HOST"'\/builds\/centos_x64"/g' mginstallcentos.sh
+wget "http://$DOWNLOAD_HOST/$URI_PART/$DIST_DIR/mginstallcentos.sh"
+sed -i 's/URL="$URL_ROOT\/$URL_PART"/URL="http:\/\/'"$DOWNLOAD_HOST"'\/'"$URI_PART"'\/'"$DIST_DIR"'"/g' mginstallcentos.sh
chmod +x smoke_test.sh
chmod +x mginstallcentos.sh
sudo -E ./mginstallcentos.sh
Modified: branches/3.0/vagrant/centos/test_x86/Vagrantfile
===================================================================
--- branches/3.0/vagrant/centos/test_x86/Vagrantfile 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/centos/test_x86/Vagrantfile 2015-03-29 15:10:47 UTC (rev 8606)
@@ -119,5 +119,5 @@
config.vm.provision "shell",
privileged: false,
path: "provision.sh",
- args: "#{ENV['DOWNLOAD_HOST']}"
+ args: ["#{ENV['DOWNLOAD_HOST']}", "#{ENV['MG_DIST_DIR']}"]
end
Modified: branches/3.0/vagrant/centos/test_x86/provision.sh
===================================================================
--- branches/3.0/vagrant/centos/test_x86/provision.sh 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/centos/test_x86/provision.sh 2015-03-29 15:10:47 UTC (rev 8606)
@@ -1,13 +1,14 @@
#!/bin/bash
DOWNLOAD_HOST=$1
+URI_PART=$2
+DIST_DIR="centos_x86"
sudo yum install -y wget
echo Download host is: $DOWNLOAD_HOST
-wget "http://$DOWNLOAD_HOST/builds/Sheboygan.mgp"
-wget "http://$DOWNLOAD_HOST/builds/smoke_test.sh"
+wget "http://$DOWNLOAD_HOST/$URI_PART/Sheboygan.mgp"
+wget "http://$DOWNLOAD_HOST/$URI_PART/smoke_test.sh"
sudo mv Sheboygan.mgp /tmp/
-wget "http://$DOWNLOAD_HOST/builds/centos_x86/mginstallcentos.sh"
-sed -i 's/URL="http:\/\/download/URL_OLD="http:\/\/download/g' mginstallcentos.sh
-sed -i 's/#URL="http:\/\/192.168.0.4\/downloads"/URL="http:\/\/'"$DOWNLOAD_HOST"'\/builds\/centos_x86"/g' mginstallcentos.sh
+wget "http://$DOWNLOAD_HOST/$URI_PART/$DIST_DIR/mginstallcentos.sh"
+sed -i 's/URL="$URL_ROOT\/$URL_PART"/URL="http:\/\/'"$DOWNLOAD_HOST"'\/'"$URI_PART"'\/'"$DIST_DIR"'"/g' mginstallcentos.sh
chmod +x smoke_test.sh
chmod +x mginstallcentos.sh
sudo -E ./mginstallcentos.sh
Modified: branches/3.0/vagrant/centos/x64/Vagrantfile
===================================================================
--- branches/3.0/vagrant/centos/x64/Vagrantfile 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/centos/x64/Vagrantfile 2015-03-29 15:10:47 UTC (rev 8606)
@@ -147,16 +147,16 @@
HAVE_FDO=0
HAVE_FDO_LIBS=0
HAVE_MAPGUIDE=0
-MG_UNIT_TEST=1
-FDO_UNIT_TEST=1
+MG_UNIT_TEST=0
+FDO_UNIT_TEST=0
MAKE_FDO_SDK=0
SCRIPT_ROOT=~/scripts
-FDO_SRC_ROOT=~/fdo
+FDO_SRC_ROOT=~/fdo/branches
FDO_VER_MM=4.0
FDO_VER_FULL=${FDO_VER_MM}.0
MG_VER_MM=3.0
MG_VER_FULL=${MG_VER_MM}.0
-FDO_SRC_DIR=branches/4.0
+FDO_SRC_DIR=4.0
FDO_SRC=$FDO_SRC_ROOT/$FDO_SRC_DIR
FDO_LIB_SRC=~/fdo_rdbms_thirdparty
MG_SRC_ROOT=~/mapguide/branches/3.0
@@ -331,6 +331,7 @@
echo [provision]: Copy install/uninstall scripts to output dir
sudo cp /vagrant/mginstallcentos.sh /vagrant/build/mginstallcentos.sh
sudo cp /vagrant/mguninstallcentos.sh /vagrant/build/mguninstallcentos.sh
+sudo sed -i 's/URL_PART="centos"/URL_PART="centos_x64"/g' /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
Modified: branches/3.0/vagrant/centos/x86/Vagrantfile
===================================================================
--- branches/3.0/vagrant/centos/x86/Vagrantfile 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/centos/x86/Vagrantfile 2015-03-29 15:10:47 UTC (rev 8606)
@@ -147,16 +147,16 @@
HAVE_FDO=0
HAVE_FDO_LIBS=0
HAVE_MAPGUIDE=0
-MG_UNIT_TEST=1
-FDO_UNIT_TEST=1
+MG_UNIT_TEST=0
+FDO_UNIT_TEST=0
MAKE_FDO_SDK=0
SCRIPT_ROOT=~/scripts
-FDO_SRC_ROOT=~/fdo
+FDO_SRC_ROOT=~/fdo/branches
FDO_VER_MM=4.0
FDO_VER_FULL=${FDO_VER_MM}.0
MG_VER_MM=3.0
MG_VER_FULL=${MG_VER_MM}.0
-FDO_SRC_DIR=branches/4.0
+FDO_SRC_DIR=4.0
FDO_SRC=$FDO_SRC_ROOT/$FDO_SRC_DIR
FDO_LIB_SRC=~/fdo_rdbms_thirdparty
MG_SRC_ROOT=~/mapguide/branches/3.0
@@ -331,6 +331,7 @@
sudo mv ~/fdo_*_unit_test.log /vagrant/build
sudo mv ~/UnitTestResults_*.xml /vagrant/build
echo [provision]: Copy install/uninstall scripts to output dir
+sudo sed -i 's/URL_PART="centos"/URL_PART="centos_x86"/g' /vagrant/build/mginstallcentos.sh
sudo cp /vagrant/mginstallcentos.sh /vagrant/build/mginstallcentos.sh
sudo cp /vagrant/mguninstallcentos.sh /vagrant/build/mguninstallcentos.sh
sudo sed -i 's/FDOVER_REV=0/FDOVER_REV='"$FDO_REV"'/g' /vagrant/build/mginstallcentos.sh
Modified: branches/3.0/vagrant/ubuntu/test_x64/Vagrantfile
===================================================================
--- branches/3.0/vagrant/ubuntu/test_x64/Vagrantfile 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/ubuntu/test_x64/Vagrantfile 2015-03-29 15:10:47 UTC (rev 8606)
@@ -119,5 +119,5 @@
config.vm.provision "shell",
privileged: false,
path: "provision.sh",
- args: "#{ENV['DOWNLOAD_HOST']}"
+ args: ["#{ENV['DOWNLOAD_HOST']}", "#{ENV['MG_DIST_DIR']}"]
end
Modified: branches/3.0/vagrant/ubuntu/test_x64/provision.sh
===================================================================
--- branches/3.0/vagrant/ubuntu/test_x64/provision.sh 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/ubuntu/test_x64/provision.sh 2015-03-29 15:10:47 UTC (rev 8606)
@@ -1,12 +1,13 @@
#!/bin/bash
DOWNLOAD_HOST=$1
+URI_PART=$2
+DIST_DIR="ubuntu_x64"
echo Download host is: $DOWNLOAD_HOST
-wget "http://$DOWNLOAD_HOST/builds/Sheboygan.mgp"
-wget "http://$DOWNLOAD_HOST/builds/smoke_test.sh"
+wget "http://$DOWNLOAD_HOST/$URI_PART/Sheboygan.mgp"
+wget "http://$DOWNLOAD_HOST/$URI_PART/smoke_test.sh"
sudo mv Sheboygan.mgp /tmp/
-wget "http://$DOWNLOAD_HOST/builds/ubuntu_x64/mginstallubuntu.sh"
-sed -i 's/URL="http:\/\/download/URL_OLD="http:\/\/download/g' mginstallubuntu.sh
-sed -i 's/#URL="http:\/\/192.168.0.5\/downloads\/ubuntu12"/URL="http:\/\/'"$DOWNLOAD_HOST"'\/builds\/ubuntu_x64"/g' mginstallubuntu.sh
+wget "http://$DOWNLOAD_HOST/$URI_PART/$DIST_DIR/mginstallubuntu.sh"
+sed -i 's/URL="$URL_ROOT\/$URL_PART"/URL="http:\/\/'"$DOWNLOAD_HOST"'\/'"$URI_PART"'\/'"$DIST_DIR"'"/g' mginstallubuntu.sh
chmod +x smoke_test.sh
chmod +x mginstallubuntu.sh
sudo ./mginstallubuntu.sh --headless --with-sdf --with-shp --with-ogr --with-gdal --with-sqlite
Modified: branches/3.0/vagrant/ubuntu/test_x86/Vagrantfile
===================================================================
--- branches/3.0/vagrant/ubuntu/test_x86/Vagrantfile 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/ubuntu/test_x86/Vagrantfile 2015-03-29 15:10:47 UTC (rev 8606)
@@ -119,5 +119,5 @@
config.vm.provision "shell",
privileged: false,
path: "provision.sh",
- args: "#{ENV['DOWNLOAD_HOST']}"
+ args: ["#{ENV['DOWNLOAD_HOST']}", "#{ENV['MG_DIST_DIR']}"]
end
Modified: branches/3.0/vagrant/ubuntu/test_x86/provision.sh
===================================================================
--- branches/3.0/vagrant/ubuntu/test_x86/provision.sh 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/ubuntu/test_x86/provision.sh 2015-03-29 15:10:47 UTC (rev 8606)
@@ -1,12 +1,13 @@
#!/bin/bash
DOWNLOAD_HOST=$1
+URI_PART=$2
+DIST_DIR="ubuntu_x86"
echo Download host is: $DOWNLOAD_HOST
-wget "http://$DOWNLOAD_HOST/builds/Sheboygan.mgp"
-wget "http://$DOWNLOAD_HOST/builds/smoke_test.sh"
+wget "http://$DOWNLOAD_HOST/$URI_PART/Sheboygan.mgp"
+wget "http://$DOWNLOAD_HOST/$URI_PART/smoke_test.sh"
sudo mv Sheboygan.mgp /tmp/
-wget "http://$DOWNLOAD_HOST/builds/ubuntu_x86/mginstallubuntu.sh"
-sed -i 's/URL="http:\/\/download/URL_OLD="http:\/\/download/g' mginstallubuntu.sh
-sed -i 's/#URL="http:\/\/192.168.0.5\/downloads\/ubuntu12"/URL="http:\/\/'"$DOWNLOAD_HOST"'\/builds\/ubuntu_x86"/g' mginstallubuntu.sh
+wget "http://$DOWNLOAD_HOST/$URI_PART/$DIST_DIR/mginstallubuntu.sh"
+sed -i 's/URL="$URL_ROOT\/$URL_PART"/URL="http:\/\/'"$DOWNLOAD_HOST"'\/'"$URI_PART"'\/'"$DIST_DIR"'"/g' mginstallubuntu.sh
chmod +x smoke_test.sh
chmod +x mginstallubuntu.sh
sudo ./mginstallubuntu.sh --headless --with-sdf --with-shp --with-ogr --with-gdal --with-sqlite
Modified: branches/3.0/vagrant/ubuntu/x64/Vagrantfile
===================================================================
--- branches/3.0/vagrant/ubuntu/x64/Vagrantfile 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/ubuntu/x64/Vagrantfile 2015-03-29 15:10:47 UTC (rev 8606)
@@ -140,15 +140,15 @@
HAVE_FDO=0
HAVE_FDO_LIBS=0
HAVE_MAPGUIDE=0
-MG_UNIT_TEST=1
-FDO_UNIT_TEST=1
+MG_UNIT_TEST=0
+FDO_UNIT_TEST=0
SCRIPT_ROOT=~/scripts
-FDO_SRC_ROOT=~/fdo
+FDO_SRC_ROOT=~/fdo/branches
FDO_VER_MM=4.0
FDO_VER_FULL=${FDO_VER_MM}.0
MG_VER_MM=3.0
MG_VER_FULL=${MG_VER_MM}.0
-FDO_SRC_DIR=branches/4.0
+FDO_SRC_DIR=4.0
FDO_SRC=$FDO_SRC_ROOT/$FDO_SRC_DIR
FDO_LIB_SRC=~/fdo_rdbms_thirdparty
MG_SRC_ROOT=~/mapguide/branches/3.0
@@ -363,6 +363,7 @@
sudo cp ~/UnitTestResults_*.xml /vagrant/build
sudo cp /vagrant/mginstallubuntu.sh /vagrant/build/mginstallubuntu.sh
sudo cp /vagrant/mguninstallubuntu.sh /vagrant/build/mguninstallubuntu.sh
+sudo sed -i 's/URL_PART="ubuntu12"/URL_PART="ubuntu12_x64"/g' /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
Modified: branches/3.0/vagrant/ubuntu/x86/Vagrantfile
===================================================================
--- branches/3.0/vagrant/ubuntu/x86/Vagrantfile 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/ubuntu/x86/Vagrantfile 2015-03-29 15:10:47 UTC (rev 8606)
@@ -140,15 +140,15 @@
HAVE_FDO=0
HAVE_FDO_LIBS=0
HAVE_MAPGUIDE=0
-MG_UNIT_TEST=1
-FDO_UNIT_TEST=1
+MG_UNIT_TEST=0
+FDO_UNIT_TEST=0
SCRIPT_ROOT=~/scripts
-FDO_SRC_ROOT=~/fdo
+FDO_SRC_ROOT=~/fdo/branches
FDO_VER_MM=4.0
FDO_VER_FULL=${FDO_VER_MM}.0
MG_VER_MM=3.0
MG_VER_FULL=${MG_VER_MM}.0
-FDO_SRC_DIR=branches/4.0
+FDO_SRC_DIR=4.0
FDO_SRC=$FDO_SRC_ROOT/$FDO_SRC_DIR
FDO_LIB_SRC=~/fdo_rdbms_thirdparty
MG_SRC_ROOT=~/mapguide/branches/3.0
@@ -360,6 +360,7 @@
fi
sudo cp bin/*.deb /vagrant/build
sudo cp ~/UnitTestResults_*.xml /vagrant/build
+sudo sed -i 's/URL_PART="ubuntu12"/URL_PART="ubuntu12_x86"/g' /vagrant/build/mginstallubuntu.sh
sudo cp /vagrant/mginstallubuntu.sh /vagrant/build/mginstallubuntu.sh
sudo cp /vagrant/mguninstallubuntu.sh /vagrant/build/mguninstallubuntu.sh
sudo sed -i 's/FDOBUILD=0/FDOBUILD='"$FDO_REV"'/g' /vagrant/build/mginstallubuntu.sh
Modified: branches/3.0/vagrant/verify.bat
===================================================================
--- branches/3.0/vagrant/verify.bat 2015-03-29 15:07:10 UTC (rev 8605)
+++ branches/3.0/vagrant/verify.bat 2015-03-29 15:10:47 UTC (rev 8606)
@@ -14,12 +14,15 @@
rem Requires the sed utility, which is part of GNU on Windows (https://github.com/bmatzelle/gow)
IF "%DOWNLOAD_HOST%"=="" SET DOWNLOAD_HOST=192.168.0.6
+IF "%MG_DIST_DIR%"=="" SET MG_DIST_DIR=builds30
IF "%VERIFY_UBUNTU_32%"=="" SET VERIFY_UBUNTU_32=1
IF "%VERIFY_UBUNTU_64%"=="" SET VERIFY_UBUNTU_64=1
IF "%VERIFY_CENTOS_32%"=="" SET VERIFY_CENTOS_32=1
IF "%VERIFY_CENTOS_64%"=="" SET VERIFY_CENTOS_64=1
echo **************** Verify Summary *********************
+echo Download Host is: %DOWNLOAD_HOST%
+echo Dist directory name: %MG_DIST_DIR%
echo Verifying Ubuntu (32-bit): %VERIFY_UBUNTU_32%
echo Verifying Ubuntu (64-bit): %VERIFY_UBUNTU_64%
echo Verifying CentOS (32-bit): %VERIFY_CENTOS_32%
More information about the mapguide-commits
mailing list