osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40944?usp=email ) Change subject: testenv: debian 13: fix installing eclipse-titan ...................................................................... testenv: debian 13: fix installing eclipse-titan Use the current debian version instead of hardcoding Debian_12. Change-Id: I56be4e3e72a1ad4590e904f9a48d90aa635c9980 --- M _testenv/data/podman/Dockerfile 1 file changed, 4 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 99cc12a..91569ee 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -2,10 +2,6 @@ ARG DISTRO=debian:12 FROM ${REGISTRY}/${DISTRO} -# Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/" - # Copy from common dir COPY obs.key /obs.key @@ -146,11 +142,11 @@ pip3 install ./osmo-python-tests --break-system-packages && \ rm -rf osmo-python-tests -# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes -RUN echo "deb [signed-by=/obs.key] $OSMOCOM_REPO ./" \ - > /etc/apt/sources.list.d/osmocom-latest.list -ADD $OSMOCOM_REPO/Release /tmp/Release +# Add eclipse-titan from osmocom:latest RUN set -x && \ + export DEBVER="$(grep ^VERSION_ID /etc/os-release | cut -d '"' -f 2)" && \ + export OSMOCOM_REPO="https://downloads.osmocom.org/packages/osmocom:/latest/D… && \ + echo "deb [signed-by=/obs.key] $OSMOCOM_REPO ./" >/etc/apt/sources.list.d/osmocom-latest.list && \ apt-get update && \ apt-get install -y --no-install-recommends \ eclipse-titan-optdir-9.0.0 \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40944?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I56be4e3e72a1ad4590e904f9a48d90aa635c9980 Gerrit-Change-Number: 40944 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>