From 30b0302c6d23598374fd5ab9363eb2d718d7fc1e Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Thu, 7 Sep 2023 11:05:26 -0400 Subject: ci: setup postgresql inside test job --- ci/Containerfile | 7 ++++++- ci/jobs/2-test/test.sh | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ci/Containerfile b/ci/Containerfile index 720d28853..a83989ea4 100644 --- a/ci/Containerfile +++ b/ci/Containerfile @@ -8,7 +8,6 @@ RUN apt-get update -yqq && \ autopoint \ curl \ git \ - jq \ libcurl4-gnutls-dev \ libgcrypt-dev \ libidn11-dev \ @@ -40,6 +39,12 @@ RUN apt-get install -yqq \ doxygen \ graphviz +# Test suite dependencies +RUN apt-get install -yqq \ + jq \ + postgresql \ + sudo + # Install Taler (and friends) packages RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources diff --git a/ci/jobs/2-test/test.sh b/ci/jobs/2-test/test.sh index 6c3d2be21..06bc18097 100755 --- a/ci/jobs/2-test/test.sh +++ b/ci/jobs/2-test/test.sh @@ -8,11 +8,15 @@ set -evu make make install +sudo -u postgres /usr/lib/postgresql/15/bin/postgres -D /etc/postgresql/15/main -h localhost -p 5432 & +sleep 10 +sudo -u postgres createuser -p 5432 root +sudo -u postgres createdb -p 5432 -O root talercheck check_command() { # Set LD_LIBRARY_PATH so tests can find the installed libs - LD_LIBRARY_PATH=/usr/local/lib make check + LD_LIBRARY_PATH=/usr/local/lib PGPORT=5432 make check } print_logs() -- cgit v1.2.3