merchant

commit a2beb276c7230c189bef3e3c5e47e32054b22617
parent aebef7a38b7e41f31d20baf5b220c006f9ce596f
Author: Florian Dold <dold@taler.net>
Date:   Sat,  5 Sep 2026 00:27:22 +0200

ci: fix package dependencies

Diffstat:
M
contrib/ci/Containerfile
 | 
12
+++++++++---
M
contrib/ci/jobs/2-test/3-startdb.sh
 | 
4
++++

2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile
@@ -15,6 +15,7 @@ RUN apt-get update -yqq && \
 		   make \
 		   postgresql \
                    python3-pip \
+		   python3-venv \
 		   python3-sphinx \
 		   python3-sphinx-rtd-theme \
                    texinfo \
@@ -34,7 +35,10 @@ RUN apt-get install -yqq \
                    devscripts \
 		   git-buildpackage
 
-RUN pip3 install --break-system-packages requests click poetry uwsgi htmlark
+RUN python3 -m venv /opt/merchant-ci && \
+    /opt/merchant-ci/bin/pip install requests click poetry uwsgi htmlark
+
+ENV PATH="/opt/merchant-ci/bin:${PATH}"
 
 # Install docs generation utils
 RUN apt-get update -yqq && \
@@ -46,8 +50,10 @@ RUN apt-get update -yqq && \
    && rm -rf /var/lib/apt/lists/*
 
 # Install Taler (and friends) packages
-RUN curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \
-    | tee /etc/apt/sources.list.d/taler-trixie-ci.sources
+RUN curl -sSL https://taler.net/taler-systems.gpg \
+        -o /etc/apt/keyrings/taler-systems.gpg && \
+    echo 'deb [signed-by=/etc/apt/keyrings/taler-systems.gpg] https://deb.taler.net/apt/debian trixie-testing main' \
+        > /etc/apt/sources.list.d/taler.list
 
 RUN echo '\
 Package: * \n\
diff --git a/contrib/ci/jobs/2-test/3-startdb.sh b/contrib/ci/jobs/2-test/3-startdb.sh
@@ -11,3 +11,7 @@ sudo -u postgres "${PG_BIN}/pg_ctl" \
 sleep 10
 sudo -u postgres createuser -p "$PGPORT" root -s -w
 sudo -u postgres createdb -p "$PGPORT" -O root talercheck
+
+# taler-unified-setup resets the merchant schema before every test.  Seed a
+# newly-created database once so that the first reset has tables to drop.
+taler-merchant-dbinit -c src/testing/test_template.conf