From d90399c2609f15989b12b8bcdcedf20b39bd6b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 18 Mar 2025 10:59:47 +0100 Subject: [PATCH] test/cross-distro: remove repo overrides and force restart composer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Completely remove the /etc/osbuild-composer/repositories directory used for repo overrides, to ensure that only repos from the RPM are used. Moreover, instead of trying to restart osbuild-composer, which is always a tricky thing to do, let's just stop all services and call the Weldr API. Since the service is socket-activated, this will start all the necessary services. Signed-off-by: Tomáš Hozza --- test/cases/cross-distro.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/cases/cross-distro.sh b/test/cases/cross-distro.sh index 0e364c540..4fb0ec488 100755 --- a/test/cases/cross-distro.sh +++ b/test/cases/cross-distro.sh @@ -62,11 +62,11 @@ echo "====> Starting $(basename "$0")" # Remove repo overrides installed by provision.sh, these will show up in the # list and cause it to fail and are not needed since this test doesn't build # anything. -sudo rm -f /etc/osbuild-composer/repositories/* -sudo systemctl try-restart osbuild-composer +sudo rm -rf /etc/osbuild-composer/repositories +sudo systemctl stop 'osbuild*.service' +sudo composer-cli status show echo "Repository directories:" -ls -lR /etc/osbuild-composer/repositories/ ls -lR /usr/share/osbuild-composer/repositories/ echo "Repositories installed by the rpm:"