From 8a3c8f0f1401f94c4a3d05842d13a9968d7a33c4 Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Tue, 22 Oct 2024 17:41:11 +0200 Subject: [PATCH] test/integration: fix RHEL repositories Drop the package sets, I'm not sure they exist anymore in that form, it breaks depsolving. Also pirnt the journal logs during the test to make it easier to debug failures. --- test/integration.sh | 8 ++++++++ test/integration/test_koji.py | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/test/integration.sh b/test/integration.sh index afde1a9..2b8ff0c 100755 --- a/test/integration.sh +++ b/test/integration.sh @@ -56,6 +56,11 @@ sudo systemctl start osbuild-composer-api.socket # start a remote worker sudo systemctl start osbuild-remote-worker@localhost:8700.service +greenprint "Watching worker logs" +WORKER_UNIT=$(sudo systemctl list-units | grep -o -E "osbuild.*worker.*\.service") +sudo journalctl -af -n 1 -u "${WORKER_UNIT}" & +WORKER_JOURNAL_PID=$! + greenprint "Starting koji builder" sudo /usr/libexec/koji-osbuild-tests/run-builder.sh start /usr/share/koji-osbuild-tests @@ -68,6 +73,9 @@ AWS_ACCESS_KEY_ID="${V2_AWS_ACCESS_KEY_ID:-}" \ AWS_SECRET_ACCESS_KEY="${V2_AWS_SECRET_ACCESS_KEY:-}" \ python3 -m unittest discover -v /usr/libexec/koji-osbuild-tests/integration/ +greenprint "Stop watching worker logs" +sudo pkill -P ${WORKER_JOURNAL_PID} + greenprint "Stopping koji builder" sudo /usr/libexec/koji-osbuild-tests/run-builder.sh stop /usr/share/koji-osbuild-tests diff --git a/test/integration/test_koji.py b/test/integration/test_koji.py index 523d8b5..47e5733 100644 --- a/test/integration/test_koji.py +++ b/test/integration/test_koji.py @@ -51,10 +51,8 @@ class SutInfo: {"url": "http://download.fedoraproject.org/pub/fedora/linux/releases/$release/Everything/$arch/os"} ], "rhel": [ - {"url": "http://download.devel.redhat.com/released/RHEL-8/$release/BaseOS/$arch/os/", - "package_sets": "blueprint; build; packages"}, - {"url": "http://download.devel.redhat.com/released/RHEL-8/$release/AppStream/$arch/os/", - "package_sets": "blueprint; build; packages"}, + {"url": "http://download.devel.redhat.com/released/RHEL-8/$release/BaseOS/$arch/os/"}, + {"url": "http://download.devel.redhat.com/released/RHEL-8/$release/AppStream/$arch/os/"}, ] }