From ce0f99c1bec3b6179afb7040307118a01b43fa42 Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Thu, 15 Oct 2020 00:38:00 +0200 Subject: [PATCH] test: install koji-compose.py And use it from its installed location in test/cmd/koji.sh. --- osbuild-composer.spec | 2 ++ test/cmd/koji.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/osbuild-composer.spec b/osbuild-composer.spec index e7d364d8f..2b8f88f61 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -184,6 +184,7 @@ install -m 0755 -vp test/cmd/* %{buildroot}%{_l install -m 0755 -vp _bin/cloud-cleaner %{buildroot}%{_libexecdir}/osbuild-composer/ install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer/ install -m 0755 -vp tools/run-koji-container.sh %{buildroot}%{_libexecdir}/osbuild-composer/ +install -m 0755 -vp tools/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer/ install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/ansible install -m 0644 -vp test/data/ansible/* %{buildroot}%{_datadir}/tests/osbuild-composer/ansible/ @@ -360,6 +361,7 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %{_libexecdir}/osbuild-composer/cloud-cleaner %{_libexecdir}/osbuild-composer/image-info %{_libexecdir}/osbuild-composer/run-koji-container.sh +%{_libexecdir}/osbuild-composer/koji-compose.py %endif diff --git a/test/cmd/koji.sh b/test/cmd/koji.sh index 978270255..e7c93d1b2 100755 --- a/test/cmd/koji.sh +++ b/test/cmd/koji.sh @@ -60,7 +60,7 @@ greenprint "Creating Koji task" koji --server=http://localhost:8080/kojihub --user kojiadmin --password kojipass --authtype=password make-task image greenprint "Pushing compose to Koji" -sudo ./tools/koji-compose.py "${ID}-${VERSION_ID%.*}" +sudo /usr/libexec/osbuild-composer/koji-compose.py "${ID}-${VERSION_ID%.*}" greenprint "Show Koji task" koji --server=http://localhost:8080/kojihub taskinfo 1