Skip to content

Commit 37b5f78

Browse files
committed
fix(setup-node.sh): create database role for controller unit tests
This change also updates the VirtualBox and vagrant packages to match those we are currently using in testing.
1 parent a71a618 commit 37b5f78

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

tests/bin/setup-node.sh

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ apt-get install -yq openjdk-7-jre-headless
1414
# install virtualbox 4.3.14
1515
apt-get install -yq build-essential libgl1 libgl1-mesa-glx libpython2.7 libqt4-network libqt4-opengl \
1616
libqtcore4 libqtgui4 libsdl1.2debian libvpx1 libxcursor1
17-
wget http://download.virtualbox.org/virtualbox/4.3.16/virtualbox-4.3_4.3.16-95972~Ubuntu~raring_amd64.deb
18-
dpkg -i virtualbox-4.3_4.3.16-95972~Ubuntu~raring_amd64.deb && \
19-
rm virtualbox-4.3_4.3.16-95972~Ubuntu~raring_amd64.deb
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
2020

2121
# install vagrant
22-
wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.5_x86_64.deb
23-
dpkg -i vagrant_1.6.5_x86_64.deb && rm vagrant_1.6.5_x86_64.deb
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
2424

2525
# install go
2626
wget -qO- https://storage.googleapis.com/golang/go1.3.3.linux-amd64.tar.gz | tar -C /usr/local -xz
@@ -32,11 +32,6 @@ apt-get install -yq curl mercurial python-dev libpq-dev libyaml-dev git postgres
3232
RUN curl -sSL https://raw.githubusercontent.com/pypa/pip/1.5.6/contrib/get-pip.py | python -
3333
pip install virtualenv
3434

35-
# set up PostgreSQL requirements for controller unit tests
36-
sudo -u postgres createuser --createdb jenkins
37-
# sudo -u postgres psql
38-
# postgres=# create database deis owner jenkins
39-
4035
# create jenkins user and install node bootstrap script
4136
useradd -G docker,vboxusers -s /bin/bash -m jenkins
4237
mkdir -p /home/jenkins/bin
@@ -45,6 +40,9 @@ wget -x -O /home/jenkins/bin/start-node.sh \
4540
chmod +x /home/jenkins/bin/start-node.sh
4641
chown -R jenkins:jenkins /home/jenkins/bin
4742

43+
# set up PostgreSQL role for controller unit tests
44+
sudo -u postgres psql -c "CREATE ROLE deis WITH CREATEDB PASSWORD 'changeme123';"
45+
4846
# now the jenkins user has to export some envvars to start as a node
4947
echo "Remaining setup:"
5048
echo " 1. Log in as the jenkins user (sudo -i -u jenkins)"

0 commit comments

Comments
 (0)