Skip to content

Commit 59635b6

Browse files
committed
Merge pull request #3150 from mboersma/update-ci-setup
chore(tests): update CI node setup instructions
2 parents 1db155f + b5335b4 commit 59635b6

1 file changed

Lines changed: 19 additions & 14 deletions

File tree

tests/bin/setup-node.sh

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,34 @@
33
# Preps a Ubuntu 14.04 box with requirements to run as a Jenkins node to https://ci.deis.io/
44
# Should be run as root.
55

6-
# install docker 1.3.3
6+
# install docker
77
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
88
sh -c "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list"
9-
apt-get update && apt-get install -yq lxc-docker-1.3.3
9+
apt-get update && apt-get install -yq lxc-docker-1.5.0
1010

1111
# install java
1212
apt-get install -yq openjdk-7-jre-headless
1313

14-
# install virtualbox 4.3.14
15-
apt-get install -yq build-essential libgl1 libgl1-mesa-glx libpython2.7 libqt4-network libqt4-opengl \
16-
libqtcore4 libqtgui4 libsdl1.2debian libvpx1 libxcursor1
17-
wget http://download.virtualbox.org/virtualbox/4.3.20/virtualbox-4.3_4.3.20-96996~Ubuntu~raring_amd64.deb
18-
dpkg -i virtualbox-4.3_4.3.20-96996~Ubuntu~raring_amd64.deb && \
19-
rm virtualbox-4.3_4.3.20-96996~Ubuntu~raring_amd64.deb
14+
# install virtualbox
15+
apt-get install -yq build-essential libgl1-mesa-glx libpython2.7 libqt4-network libqt4-opengl \
16+
libqtcore4 libqtgui4 libsdl1.2debian libvpx1 libxcursor1 libxinerama1 libxmu6
17+
wget http://download.virtualbox.org/virtualbox/4.3.22/virtualbox-4.3_4.3.22-98236~Ubuntu~raring_amd64.deb
18+
dpkg -i virtualbox-4.3_4.3.22-98236~Ubuntu~raring_amd64.deb && \
19+
rm virtualbox-4.3_4.3.22-98236~Ubuntu~raring_amd64.deb
2020

2121
# install vagrant
22-
wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_64.deb
23-
dpkg -i vagrant_1.7.1_x86_64.deb && rm vagrant_1.7.1_x86_64.deb
22+
wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.deb
23+
dpkg -i vagrant_1.7.2_x86_64.deb && rm vagrant_1.7.2_x86_64.deb
24+
# as the jenkins user, do "vagrant plugin install vagrant-triggers"
2425

2526
# install go
26-
wget -qO- https://storage.googleapis.com/golang/go1.4.1.linux-amd64.tar.gz | tar -C /usr/local -xz
27+
wget -qO- https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | tar -C /usr/local -xz
2728
echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile
2829
echo "You must reboot for the global $PATH changes to take effect."
2930

3031
# install test suite requirements
31-
apt-get install -yq curl mercurial python-dev libpq-dev libyaml-dev git postgresql postgresql-client
32-
RUN curl -sSL https://raw.githubusercontent.com/pypa/pip/6.0.8/contrib/get-pip.py | python -
32+
apt-get install -yq curl mercurial python-dev libffi-dev libpq-dev libyaml-dev git postgresql postgresql-client
33+
curl -sSL https://raw.githubusercontent.com/pypa/pip/6.0.8/contrib/get-pip.py | python -
3334
pip install virtualenv
3435

3536
# create jenkins user and install node bootstrap script
@@ -40,8 +41,12 @@ wget -x -O /home/jenkins/bin/start-node.sh \
4041
chmod +x /home/jenkins/bin/start-node.sh
4142
chown -R jenkins:jenkins /home/jenkins/bin
4243

44+
# TODO: instructions to download and install fleetctl
45+
4346
# set up PostgreSQL role for controller unit tests
44-
sudo -u postgres psql -c "CREATE ROLE deis WITH CREATEDB PASSWORD 'changeme123';"
47+
sudo -u postgres psql -c "CREATE ROLE jenkins WITH CREATEDB LOGIN;"
48+
sudo -u postgres psql -c "CREATE DATABASE deis WITH OWNER jenkins;"
49+
# edit postgresql.conf and change "fsync = off", then restart postgresql.
4550

4651
# now the jenkins user has to export some envvars to start as a node
4752
echo "Remaining setup:"

0 commit comments

Comments
 (0)