diff options
author | Oliver Smith <osmith@sysmocom.de> | 2023-08-29 12:44:49 +0200 |
---|---|---|
committer | Oliver Smith <osmith@sysmocom.de> | 2023-08-29 12:56:34 +0200 |
commit | 451cbe7d86be71935e4614c4530517055e81bc61 (patch) | |
tree | 0a6770be07de6919ce29e95dd149289112df0f24 | |
parent | 896bb61d1b8c36a06ed549558bca024e227ec1ec (diff) |
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
-rw-r--r-- | jobs/master-builds.yml | 10 | ||||
-rwxr-xr-x | scripts/xgoldmon-jenkins.sh | 23 |
2 files changed, 31 insertions, 2 deletions
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 6837d78..6a2926c 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -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}' diff --git a/scripts/xgoldmon-jenkins.sh b/scripts/xgoldmon-jenkins.sh new file mode 100755 index 0000000..0635db4 --- /dev/null +++ b/scripts/xgoldmon-jenkins.sh @@ -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 |