summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-11-28 02:54:16 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2017-11-28 05:16:37 +0100
commit4b5d3689329afe6afb4551ee6317f1de5555b095 (patch)
tree7eeff6a30a8622cdae0a10d057e221aee9b85531 /contrib
parent83ccbfe87b001beaf0659a1ff6eda0cc5c9af915 (diff)
contrib/jenkins.sh: update from current jenkins job update-osmo-ci-on-slaves
We're not calling this script on the update-osmo-ci-on-slaves job yet. To move over to calling this script, apply some edits we made on the jenkins UI in the meantime. Change-Id: I54d3f56a89934c1c7b0e445b5c447c91bf94d579
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/jenkins.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index eb079a2..3bc49f9 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,12 +1,16 @@
#!/bin/sh
+set -e -x
-set -e
-
-cd ~/osmo-ci || (cd ~/ && git clone git://git.osmocom.org/osmo-ci && cd osmo-ci)
+cd ~/osmo-ci || (cd ~/ && git clone git://git.osmocom.org/osmo-ci && cd ~/osmo-ci)
git rev-parse HEAD
git status
-git fetch && git checkout -f -B master origin/master
+git pull origin
git rev-parse HEAD
git status
+
+if [ `uname` = "Linux" ]; then
+ cd docker
+ ./rebuild_osmocom_jenkins_image.sh
+fi