Skip to content

Commit

Permalink
test/integration: fix RHEL repositories
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
croissanne authored and supakeen committed Oct 28, 2024
1 parent c12492a commit 8a3c8f0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
8 changes: 8 additions & 0 deletions test/integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
6 changes: 2 additions & 4 deletions test/integration/test_koji.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/"},
]
}

Expand Down

0 comments on commit 8a3c8f0

Please sign in to comment.