osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/40538?usp=email )
Change subject: ttcn3-gbproxy-test: run with titan 9.0.0
......................................................................
ttcn3-gbproxy-test: run with titan 9.0.0
Some of the tests don't work with titan 11.1.0. Run the testsuite with
the previous titan version 9.0.0 for now. The ttcn3-gbproxy-test-fr is
still running with docker-playground, using the ttcn3-gbproxy-test
container.
Related: OS#6800
Change-Id: I1e66104e48470eb96848ae6b9b64cb26563d2744
---
M common/ttcn3-docker-prepare.sh
M common/ttcn3-docker-run.sh
M debian-bookworm-titan/Dockerfile
M ttcn3-gbproxy-test/Dockerfile
4 files changed, 17 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/38/40538/1
diff --git a/common/ttcn3-docker-prepare.sh b/common/ttcn3-docker-prepare.sh
index ef684be..1da1c58 100755
--- a/common/ttcn3-docker-prepare.sh
+++ b/common/ttcn3-docker-prepare.sh
@@ -1,4 +1,9 @@
#!/bin/sh -e
+if [ -n "$TITAN_VERSION" ]; then
+ export TTCN3_DIR="/opt/eclipse-titan-$TITAN_VERSION"
+ export PATH="$TTCN3_DIR/bin:$PATH"
+fi
+
if [ $# -lt 2 ]; then
echo
echo "usage: ttcn3-docker-prepare OSMO_TTCN3_BRANCH PROJECT [PROJECT
...]"
diff --git a/common/ttcn3-docker-run.sh b/common/ttcn3-docker-run.sh
index c8c871e..d22290d 100755
--- a/common/ttcn3-docker-run.sh
+++ b/common/ttcn3-docker-run.sh
@@ -1,4 +1,9 @@
#!/bin/bash
+if [ -n "$TITAN_VERSION" ]; then
+ export TTCN3_DIR="/opt/eclipse-titan-$TITAN_VERSION"
+ export PATH="$TTCN3_DIR/bin:$PATH"
+fi
+
if [ $# -lt 2 ]; then
echo
echo "usage: ttcn3-docker-run SUBDIR SUITE"
diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile
index 0ce6c43..62514b7 100644
--- a/debian-bookworm-titan/Dockerfile
+++ b/debian-bookworm-titan/Dockerfile
@@ -59,7 +59,9 @@
RUN git config --global user.email [email protected] && \
git config --global user.name "Dock Er"
-# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes
+# Add eclipse-titan (latest version we use) from osmocom:latest, as well as
+# version 9.0.0 for testsuites that still need it (OS#6800). Invalidate cache
+# when :latest changes.
RUN echo "deb [signed-by=/usr/share/keyrings/osmocom-latest.asc]
$OSMOCOM_REPO ./" \
> /etc/apt/sources.list.d/osmocom-latest.list
ADD $OSMOCOM_REPO/Release /tmp/Release
@@ -67,6 +69,7 @@
apt-get update && \
apt-get install -y --no-install-recommends \
eclipse-titan \
+ eclipse-titan-optdir-9.0.0 \
&& \
apt-get clean
diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile
index 1026180..be79ae7 100644
--- a/ttcn3-gbproxy-test/Dockerfile
+++ b/ttcn3-gbproxy-test/Dockerfile
@@ -3,6 +3,9 @@
FROM $REGISTRY/$USER/debian-bookworm-titan
ARG OSMO_TTCN3_BRANCH="master"
+# Some tests fail with titan 11.1.0 (OS#6800)
+ENV TITAN_VERSION=9.0.0
+
ADD
https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT
/tmp/commit
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" gbproxy
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40538?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I1e66104e48470eb96848ae6b9b64cb26563d2744
Gerrit-Change-Number: 40538
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
