particle-os/debian-koji-osbuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/integration: fix RHEL repositories

Browse source 
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.
This commit is contained in:
Sanne Raymaekers 2024-10-22 17:41:11 +02:00 • committed by Simon de Vlieger
parent c12492a7d4
commit 8a3c8f0f14
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/integration.sh
View file

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

6
test/integration/test_koji.py
View file

@ -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/"},
]
}