commit 05c5d50f1e594d64876beecba29602057166193c
parent 5132ad91f9b2ca8d6a35deb48f4ce6b95432a2c4
Author: Florian Dold <florian@dold.me>
Date: Tue, 25 Nov 2025 21:50:07 +0100
testing for trixie-testing
Diffstat:
4 files changed, 64 insertions(+), 39 deletions(-)
diff --git a/packaging/ng/taler-pkg b/packaging/ng/taler-pkg
@@ -318,9 +318,9 @@ def test(cfg):
"--security-opt",
"label=disable",
"--mount",
- f"type=bind,source={mydir}/testing/test-{distro},target=/runtest,readonly",
+ f"type=bind,source={mydir}/testing,target=/testing,readonly",
image_tag,
- "/runtest",
+ "/testing/test-${distro}",
]
subprocess.run(
cmd,
diff --git a/packaging/ng/testing/debian-trixie-common b/packaging/ng/testing/debian-trixie-common
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -eu
+
+apt-get update
+apt-get -y upgrade
+# We need libtalerexchange-dev for taler-fakebank-run
+apt-get -y install taler-exchange libeufin-bank libeufin-nexus taler-merchant donau taler-harness taler-wallet-cli libtalerexchange-dev
+
+PG_DATA=$(mktemp -d)
+SOCKET_DIR="/var/run/postgresql" # Standard on Debian/Ubuntu/RHEL
+PGBIN=/usr/lib/postgresql/17/bin
+
+export PATH=$PGBIN:$PATH
+
+chown postgres:postgres "$PG_DATA"
+if [ ! -d "$SOCKET_DIR" ]; then
+ mkdir -p "$SOCKET_DIR"
+fi
+chown postgres:postgres "$SOCKET_DIR"
+chmod 775 "$SOCKET_DIR"
+
+echo "Initializing database..."
+su - postgres -c "$PGBIN/initdb -D '$PG_DATA' --auth=trust --no-locale --encoding=UTF8" > /dev/null
+
+echo "Starting postgres..."
+# We DO NOT pass -k. We let it use the system compiled default.
+# We DO pass -c listen_addresses='' to disable TCP.
+su - postgres -c "$PGBIN/pg_ctl -D '$PG_DATA' -l '$PG_DATA/logfile' -o '-c listen_addresses=\"\"' start"
+
+echo "Waiting for postgres to be ready..."
+# We run pg_isready as postgres to avoid permission issues reading the socket initially
+until su - postgres -c "$PGBIN/pg_isready -q"; do
+ sleep 0.5
+done
+
+su - postgres -c "$PGBIN/createdb testdb"
+
+su - postgres -c "$PGBIN/createuser -s root"
+
+taler-harness run-integrationtests --quiet
diff --git a/packaging/ng/testing/test-debian-trixie b/packaging/ng/testing/test-debian-trixie
@@ -14,41 +14,6 @@ Types: deb
URIs: https://deb.taler.net/apt/debian
EOF
-apt-get update
-apt-get -y upgrade
-# We need libtalerexchange-dev for taler-fakebank-run
-apt-get -y install taler-exchange libeufin-bank libeufin-nexus taler-merchant donau taler-harness taler-wallet-cli libtalerexchange-dev
+export PATH=/testing:$PATH
-
-PG_DATA=$(mktemp -d)
-SOCKET_DIR="/var/run/postgresql" # Standard on Debian/Ubuntu/RHEL
-PGBIN=/usr/lib/postgresql/17/bin
-
-export PATH=$PGBIN:$PATH
-
-chown postgres:postgres "$PG_DATA"
-if [ ! -d "$SOCKET_DIR" ]; then
- mkdir -p "$SOCKET_DIR"
-fi
-chown postgres:postgres "$SOCKET_DIR"
-chmod 775 "$SOCKET_DIR"
-
-echo "Initializing database..."
-su - postgres -c "$PGBIN/initdb -D '$PG_DATA' --auth=trust --no-locale --encoding=UTF8" > /dev/null
-
-echo "Starting postgres..."
-# We DO NOT pass -k. We let it use the system compiled default.
-# We DO pass -c listen_addresses='' to disable TCP.
-su - postgres -c "$PGBIN/pg_ctl -D '$PG_DATA' -l '$PG_DATA/logfile' -o '-c listen_addresses=\"\"' start"
-
-echo "Waiting for postgres to be ready..."
-# We run pg_isready as postgres to avoid permission issues reading the socket initially
-until su - postgres -c "$PGBIN/pg_isready -q"; do
- sleep 0.5
-done
-
-su - postgres -c "$PGBIN/createdb testdb"
-
-su - postgres -c "$PGBIN/createuser -s root"
-
-taler-harness run-integrationtests --quiet
+debian-trixie-common
diff --git a/packaging/ng/testing/test-debian-trixie-testing b/packaging/ng/testing/test-debian-trixie-testing
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -eu
+
+wget -O /etc/apt/keyrings/taler-systems.gpg https://taler.net/taler-systems.gpg
+
+cat >/etc/apt/sources.list.d/taler.sources <<EOF
+Architectures: amd64
+Components: main
+X-Repolib-Name: Taler
+Signed-By: /etc/apt/keyrings/taler-systems.gpg
+Suites: trixie-testing
+Types: deb
+URIs: https://deb.taler.net/apt/debian
+EOF
+
+export PATH=/testing:$PATH
+
+debian-trixie-common
