osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/43900?usp=email ) Change subject: jobs/gerrit: modernize osmo-ttcn3-hacks ...................................................................... jobs/gerrit: modernize osmo-ttcn3-hacks * Use the debian 13 based testenv image (which we also use for building in ttcn3-*-test jobs) instead of debian-bookworm-titan (debian 12) from docker-playground. * Use rootless podman instead of docker, which means we don't need to create and switch to a user with the right PID to avoid messing up permissions on the host system. * Remove the logic for symlinking deps to a clone inside the container. This made sense in the past to avoid fetching too often from eclipse gitlab, but nowadays we clone from https://gitea.osmocom.org/mirrors so it's fine to do fresh clones every time and this makes the deps fetching logic simpler. With the previous version it could happen that checkouts became stale. * Run "make deps" separately so the output for it is clearly separated (e.g. it may say "Nothing to be done for 'deps'." instead of silently moving on with the compile target). * Wipe at the beginning to ensure we don't have stale deps and clean when done to save disk space. Change-Id: I89791d7457d4d8659716837aa5901c262789eada --- M jobs/gerrit-verifications.yml 1 file changed, 15 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/00/43900/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 27bd888..034d02b 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -581,21 +581,25 @@ - osmo-ttcn3-hacks: slave_axis: !!python/tuple [ttcn3] cmd: | - docker run \ + TITAN_VERSION=11.1.0 + DISTRO="debian:trixie" + IMAGE="registry.osmocom.org/osmocom-build/"$(echo "$DISTRO" | tr : -)"-osmo-ttcn3-testenv" + + podman run \ --rm \ -v "$PWD:/build" \ - "registry.osmocom.org/osmocom-build/debian-bookworm-titan" \ + -w "/build" \ + "$IMAGE" \ {timeout_cmd} \ - sh -e -x -c ' - useradd --uid=1000 build - for i in /osmo-ttcn3-hacks/deps/*/; do - if ! [ -e /build/deps/"$(basename "$i")" ]; then - ln -s "$i" /build/deps/ - fi - done - su build -c "make -C /build clean compile" - ' + sh -e -x -c " + export TTCN3_DIR='/opt/eclipse-titan-$TITAN_VERSION' + export PATH=\"\$TTCN3_DIR/bin:\$PATH\" + make deps + make compile + make clean + " pipeline_binpkgs: "" + wipe: true - dahdi-tools: pipeline_lint: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I89791d7457d4d8659716837aa5901c262789eada Gerrit-Change-Number: 43900 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith@sysmocom.de>