osmith has uploaded this change for review.

View Change

testenv: support Debian Unstable

Related: SYS#7025#note-10
Change-Id: Ib8f04ee1e8b33f6e724ea2a74b1a96f26746e878
---
M _testenv/data/podman/Dockerfile
M _testenv/testenv/__init__.py
M _testenv/testenv/podman.py
3 files changed, 5 insertions(+), 2 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/43084/1

diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile
index cc0a9f6..77ad49e 100644
--- a/_testenv/data/podman/Dockerfile
+++ b/_testenv/data/podman/Dockerfile
@@ -1,6 +1,7 @@
 ARG	REGISTRY=docker.io
 ARG	DISTRO=debian:12
 FROM	${REGISTRY}/${DISTRO}
+ARG	REPODIR=Debian_12
 
 # Copy from common dir
 COPY	obs.key /obs.key
@@ -141,8 +142,7 @@
 
 # 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/Debian_$DEBVER/" && \
+	export OSMOCOM_REPO="https://downloads.osmocom.org/packages/osmocom:/latest/$REPODIR/" && \
 	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 \
diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py
index 8a3b728..b9ec676 100644
--- a/_testenv/testenv/__init__.py
+++ b/_testenv/testenv/__init__.py
@@ -26,6 +26,7 @@
 distros_repodirs = {
     "debian:bookworm": "Debian_12",
     "debian:trixie": "Debian_13",
+    "debian:unstable": "Debian_Unstable",
 }
 
 
diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py
index dd3c592..a3e7948 100644
--- a/_testenv/testenv/podman.py
+++ b/_testenv/testenv/podman.py
@@ -72,6 +72,8 @@
             "build",
             "--build-arg",
             f"DISTRO={distro}",
+            "--build-arg",
+            f"REPODIR={testenv.distros_repodirs[distro]}",
             "-t",
             image_name,
             os.path.join(testenv.data_dir, "podman"),

To view, visit change 43084. To unsubscribe, or for help writing mail filters, visit settings.