From ca395236a59ce4a9ed701e29f95d1fcd9bbdb3ca Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Thu, 11 Jan 2024 16:58:10 +0100 Subject: [PATCH] Fix DB in podman acceptance test run --- testsuite/podman_runner/03_run_controller.sh | 2 +- testsuite/podman_runner/08_manager_setup.sh | 1 + testsuite/podman_runner/provide-db-schema.sh | 13 +++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100755 testsuite/podman_runner/provide-db-schema.sh diff --git a/testsuite/podman_runner/03_run_controller.sh b/testsuite/podman_runner/03_run_controller.sh index 9062b68c347e..c27c04e547ab 100755 --- a/testsuite/podman_runner/03_run_controller.sh +++ b/testsuite/podman_runner/03_run_controller.sh @@ -4,4 +4,4 @@ src_dir=$(cd $(dirname "$0")/../.. && pwd -P) sudo -i podman run --rm -d --network uyuni-network-1 -v /tmp/test-all-in-one:/tmp --name controller-test -h controller-test -v ${src_dir}/testsuite:/testsuite ghcr.io/$UYUNI_PROJECT/uyuni/ci-test-controller-dev:$UYUNI_VERSION -podman ps +sudo podman ps diff --git a/testsuite/podman_runner/08_manager_setup.sh b/testsuite/podman_runner/08_manager_setup.sh index 43432e0820ce..778c875b8b7c 100755 --- a/testsuite/podman_runner/08_manager_setup.sh +++ b/testsuite/podman_runner/08_manager_setup.sh @@ -3,6 +3,7 @@ set -xe src_dir=$(cd $(dirname "$0")/../.. && pwd -P) +sudo -i podman exec uyuni-server-all-in-one-test bash -c "/testsuite/podman_runner/provide-db-schema.sh" sudo -i podman exec uyuni-server-all-in-one-test bash -c "/usr/lib/susemanager/bin/mgr-setup -l /var/log/susemanager_setup.log -s" sudo -i podman exec uyuni-server-all-in-one-test bash -c "/usr/bin/spacewalk-schema-upgrade -y" diff --git a/testsuite/podman_runner/provide-db-schema.sh b/testsuite/podman_runner/provide-db-schema.sh new file mode 100755 index 000000000000..3b4d8c8ccdbc --- /dev/null +++ b/testsuite/podman_runner/provide-db-schema.sh @@ -0,0 +1,13 @@ +#! /bin/bash + +set -e + +# we changed the schema dir, but we start with a schema which live still in the old location +# provide a symlink to make the tooling work +test -d /usr/share/susemanager/db || mkdir -p /usr/share/susemanager/db +if [ -d /etc/sysconfig/rhn/postgres -a ! -e /usr/share/susemanager/db/postgres ]; then + ln -s /etc/sysconfig/rhn/postgres /usr/share/susemanager/db/postgres +fi +if [ -d /etc/sysconfig/rhn/reportdb -a ! -e /usr/share/susemanager/db/reportdb ]; then + ln -s /etc/sysconfig/rhn/reportdb /usr/share/susemanager/db/reportdb +fi