test: install koji-compose.py

And use it from its installed location in test/cmd/koji.sh.
This commit is contained in:
Lars Karlitski 2020-10-15 00:38:00 +02:00 committed by Ondřej Budai
parent 6badebef4f
commit ce0f99c1be
2 changed files with 3 additions and 1 deletions

View file

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

View file

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