aboutsummaryrefslogtreecommitdiff
path: root/control
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2012-05-24 19:23:07 +0300
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2012-05-24 19:23:07 +0300
commit6e194808870369a671779dadce09e7326f306a64 (patch)
tree4abb278ee2d9a9e07e9e76678b8b1ba082b37956 /control
parente8a1e28edb71a14f6f6f2e2fc35f08b2fe1b6687 (diff)
Use apt-get install -f to deal with Jenkins dependencies.
Diffstat (limited to 'control')
-rwxr-xr-xcontrol/setup-control-node5
1 files changed, 4 insertions, 1 deletions
diff --git a/control/setup-control-node b/control/setup-control-node
index 9b3c8b8..cec0419 100755
--- a/control/setup-control-node
+++ b/control/setup-control-node
@@ -31,7 +31,10 @@ wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | sudo apt-key
#sudo apt-get update -qq
#sudo apt-get install -qq -y jenkins
wget -q $JENKINS_DEB
-sudo dpkg -i $(basename $JENKINS_DEB)
+# This might fail due to missing dependencies
+sudo dpkg -i $(basename $JENKINS_DEB) || true
+# Make apt-get install missing dependencies
+sudo apt-get install -qq -f
sudo sed -i 's%HTTP_PORT=8080%HTTP_PORT=9090%' /etc/default/jenkins
sudo sed -i 's%JENKINS_ARGS="%&--prefix=/jenkins %' /etc/default/jenkins