Review at  https://gerrit.osmocom.org/4589

jenkins: use common osmo-build-dep.sh and osmo-clean-workspace.sh

Since the gerrit build jobs no longer contain git clean workspace config (for
good reasons), it is important to use osmo-clean-workspace.sh. To make it work
best, this jenkins.sh should follow the same structure as most others do.

Change-Id: I3eca957c52b2c018e4c784b29330a0d06c4e3595
---
M contrib/jenkins.sh
1 file changed, 37 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/89/4589/1

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 503b6a0..895ffc6 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,15 +1,40 @@
-#!/bin/sh -ex
+#!/usr/bin/env bash
+# jenkins build helper script for openbsc.  This is how we build on 
jenkins.osmocom.org
 
-rm -rf deps/install
-mkdir deps || true
-cd deps
-osmo-deps.sh libosmocore
+if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then
+       echo "Error: We need to have scripts/osmo-deps.sh from 
http://git.osmocom.org/osmo-ci/ in PATH !"
+       exit 2
+fi
 
-cd libosmocore
-autoreconf --install --force
-./configure --prefix=$PWD/../install
-$MAKE $PARALLEL_MAKE install
+set -ex
 
-cd ../../src
-make clean || true
-PKG_CONFIG_PATH=$PWD/../deps/install/lib/pkgconfig $MAKE
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
+
+osmo-clean-workspace.sh
+
+mkdir "$deps" || true
+
+osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false
+
+verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+
+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
+
+set +x
+echo
+echo
+echo
+echo " =============================== osmo-tetra 
==============================="
+echo
+set -x
+
+cd "$base"
+cd src
+$MAKE clean || true
+$MAKE
+
+osmo-clean-workspace.sh

-- 
To view, visit https://gerrit.osmocom.org/4589
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eca957c52b2c018e4c784b29330a0d06c4e3595
Gerrit-PatchSet: 1
Gerrit-Project: osmo-tetra
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <[email protected]>

Reply via email to