mirror of https://gerrit.osmocom.org/osmo-ci
jobs/master-builds: add xgoldmon
Replace the legacy xgoldmon job (not done with jenkins-job-builder) with a new master-xgoldmon job that works more similar to other master jobs: - build in docker - have build commands in a jenkins.sh script Put the jenkins.sh script into osmo-ci, as the upstream repository is outside of Osmocom infrastructure. The motivation for this change is, that the current xgoldmon job is failing since libosmocore depends on liburing by default. This uncovered that the job is still running outside of docker, where the dependency has already been added. The following patches will modernize other jobs which have the same problem. Change-Id: Ice5704eb12f3c3a777961bc18a55fac63df80fd6
This commit is contained in:
parent
896bb61d1b
commit
451cbe7d86
|
@ -173,7 +173,7 @@
|
|||
# master-osmo-bsc, master-osmo-bts, master-osmo-ggsn, master-osmo-gmr, master-osmo-hlr,
|
||||
# master-osmo-iuh, master-osmo-mgw, master-osmo-msc, master-osmo-pcap, master-osmo-pcu,
|
||||
# master-osmo-sgsn, master-osmo-sip-connector, master-osmo-tetra, master-osmo-hnodeb
|
||||
# master-osmocom-bb, SIMtrace, xgoldmon
|
||||
# master-osmocom-bb, SIMtrace, master-xgoldmon
|
||||
# Optimized:
|
||||
# libosmocore
|
||||
# -> master-libosmo-abis
|
||||
|
@ -212,7 +212,7 @@
|
|||
master-osmo-trx,
|
||||
master-osmocom-bb,
|
||||
SIMtrace,
|
||||
xgoldmon
|
||||
master-xgoldmon
|
||||
|
||||
- libsmpp34:
|
||||
trigger: master-osmo-msc, master-openbsc
|
||||
|
@ -519,6 +519,12 @@
|
|||
|
||||
- dahdi-tools
|
||||
|
||||
- xgoldmon:
|
||||
git_base_url: https://github.com/2b-as
|
||||
cmd: |
|
||||
git clone --depth=1 https://gerrit.osmocom.org/osmo-ci -b master
|
||||
{docker_run_ccache} {docker_img} {timeout_cmd} /build/osmo-ci/scripts/xgoldmon-jenkins.sh
|
||||
|
||||
jobs:
|
||||
- 'master-{repos}'
|
||||
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
#!/bin/sh -ex
|
||||
# Used by jobs/master-builds.yml for xgoldmon
|
||||
TOPDIR=/build
|
||||
|
||||
if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then
|
||||
echo "Error: missing scripts from osmo-ci.git in PATH!"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
set -x
|
||||
|
||||
osmo-clean-workspace.sh
|
||||
|
||||
export deps="$TOPDIR/deps"
|
||||
export inst="$deps/install"
|
||||
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
export LD_LIBRARY_PATH="$inst/lib"
|
||||
|
||||
mkdir -p deps
|
||||
osmo-build-dep.sh libosmocore "" '--disable-doxygen'
|
||||
|
||||
cd "$TOPDIR"
|
||||
$MAKE
|
Loading…
Reference in New Issue