ref(tests): update details in CI node setup script

Author: mboersma

tests/bin/destroy-all-vagrants.sh

@@ -10,5 +10,5 @@ for dir in $VMS; do
 done
 
 # optional commands to remove all VirtualBox vms, since sometimes they are orphaned
-#VBoxManage list vms | sed -n -e 's/^.* {\(.*\)}/\1/p' | xargs -L1 -i VBoxManage unregistervm {} --delete
+#VBoxManage list vms | sed -n -e 's/^.* {\(.*\)}/\1/p' | xargs -L1 -I {} VBoxManage unregistervm {} --delete
 #rm -rf $HOME/VirtualBox\ VMs/deis*

tests/bin/setup-node.sh

@@ -3,35 +3,40 @@
 # Preps a Ubuntu 14.04 box with requirements to run as a Jenkins node to http://ci.deis.io/
 # Should be run as root.
 
-# install docker 1.1.2
+# install docker 1.2.0
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
 sh -c "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list"
-apt-get update
-apt-get install -yq lxc-docker-1.1.2
+apt-get update && apt-get install -yq lxc-docker-1.2.0
 
 # install java
-apt-get install -yq java-common openjdk-7-jre-headless
+apt-get install -yq openjdk-7-jre-headless
 
 # install virtualbox 4.3.14
 apt-get install -yq build-essential libgl1 libgl1-mesa-glx libpython2.7 libqt4-network libqt4-opengl \
     libqtcore4 libqtgui4 libsdl1.2debian libvpx1 libxcursor1
-wget http://download.virtualbox.org/virtualbox/4.3.14/virtualbox-4.3_4.3.14-95030~Ubuntu~raring_amd64.deb
-dpkg -i virtualbox-4.3_4.3.14-95030~Ubuntu~raring_amd64.deb && \
-    rm virtualbox-4.3_4.3.14-95030~Ubuntu~raring_amd64.deb
+wget http://download.virtualbox.org/virtualbox/4.3.16/virtualbox-4.3_4.3.16-95972~Ubuntu~raring_amd64.deb
+dpkg -i virtualbox-4.3_4.3.16-95972~Ubuntu~raring_amd64.deb && \
+    rm virtualbox-4.3_4.3.16-95972~Ubuntu~raring_amd64.deb
 
 # install vagrant
-wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.deb
-dpkg -i vagrant_1.6.3_x86_64.deb && rm vagrant_1.6.3_x86_64.deb
+wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.5_x86_64.deb
+dpkg -i vagrant_1.6.5_x86_64.deb && rm vagrant_1.6.5_x86_64.deb
 
 # install go
 wget -qO- https://storage.googleapis.com/golang/go1.3.1.linux-amd64.tar.gz | tar -C /usr/local -xz
 echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile
+echo "You must reboot for the global $PATH changes to take effect."
 
 # install test suite requirements
-apt-get install -yq python-dev libpq-dev libyaml-dev git postgresql postgresql-client
+apt-get install -yq curl mercurial python-dev libpq-dev libyaml-dev git postgresql postgresql-client
 RUN curl -sSL https://raw.githubusercontent.com/pypa/pip/1.5.6/contrib/get-pip.py | python -
 pip install virtualenv
 
+# set up PostgreSQL requirements for controller unit tests
+sudo -u postgres createuser --createdb jenkins
+# sudo -u postgres psql
+# postgres=# create database deis owner jenkins
+
 # create jenkins user and install node bootstrap script
 useradd -G docker,vboxusers -s /bin/bash -m jenkins
 mkdir -p /home/jenkins/bin

tests/bin/test-latest.sh

@@ -57,5 +57,5 @@ time deisctl start platform
 
 log_phase "Running integration tests"
 
-# run the full integration suite
-time make test-integration
+# run the smoke tests unless another target is specified
+make ${TEST_TYPE:-test-smoke}

tests/bin/test-setup.sh

@@ -14,6 +14,9 @@ log_phase "Preparing test environment"
 export DEIS_ROOT=${GOPATH?}/src/github.com/deis/deis
 echo "DEIS_ROOT=$DEIS_ROOT"
 
+# prepend GOPATH/bin to PATH
+export PATH=${GOPATH}/bin:$PATH
+
 # the application under test
 export DEIS_TEST_APP=${DEIS_TEST_APP:-example-go}
 echo "DEIS_TEST_APP=$DEIS_TEST_APP"
@@ -38,6 +41,10 @@ echo "DEISCTL_TUNNEL=$DEISCTL_TUNNEL"
 export DEISCTL_UNITS=${DEISCTL_UNITS:-$DEIS_ROOT/deisctl/units}
 echo "DEISCTL_UNITS=$DEISCTL_UNITS"
 
+# ip address for docker containers to communicate in functional tests
+export HOST_IPADDR=${HOST_IPADDR?}
+echo "HOST_IPADDR=$HOST_IPADDR"
+
 # the registry used to host dev-release images
 # must be accessible to local Docker engine and Deis cluster
 export DEV_REGISTRY=${DEV_REGISTRY?}