osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38442?usp=email )

Change subject: jobs/osmo-gsm-tester-builder: build in docker ......................................................................

jobs/osmo-gsm-tester-builder: build in docker

Build Osmocom programs in docker (debian bookworm), so they link against libraries available when trying to run the programs later on.

Without this we get errors like to following when osmo-gsm-tester-virtual runs in docker with debian bookworm (after recent change, before that it used debian buster): osmo-msc: error while loading shared libraries: libasan.so.5: cannot open shared object file: No such file or directory

Fixes: OS#6126 Change-Id: I109132fbb7b459652efafad4484c3fc01293bd3f --- M jobs/osmo-gsm-tester-builder.yml 1 file changed, 25 insertions(+), 3 deletions(-)

Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve

diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index ec9c29f..fdff300 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -48,8 +48,26 @@ node: osmo-gsm-tester-build builders: - shell: | - set -e -x - ./osmo-gsm-tester/contrib/jenkins-build-{repo}.sh + rm -rf docker-playground + git clone \ + --depth=1 \ + --branch="$DOCKER_PLAYGROUND_BRANCH" \ + https://gerrit.osmocom.org/docker-playground \ + docker-playground + git -C docker-playground log --oneline + make -C docker-playground/osmo-gsm-tester + + docker run \ + --rm \ + -v "$PWD:/build" \ + -v "/opt/poky-sdk:/opt/poky-sdk" \ + -v "/opt/poky-oc2g:/opt/poky-oc2g" \ + --user build \ + "$USER"/osmo-gsm-tester \ + sh -e -x -c " + cd /build + ./osmo-gsm-tester/contrib/jenkins-build-{repo}.sh + " triggers: - reverse: jobs: '{triggered-by}' @@ -67,8 +85,12 @@ parameters: - string: name: "OSMO_GSM_TESTER_BRANCH" - default: "origin/master" + default: "master" description: "Which branch/sha should be used for testing" + - string: + name: "DOCKER_PLAYGROUND_BRANCH" + default: "master" + description: "Which branch/sha should be used for building the osmo-gsm-tester docker container" - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_libosmo-abis - add_param_build_branch: