koji: move run-koji-containers.sh to tools

Also install it is part of he tests subpackage. This a helper-tool, not
golang code, so should not live in `internal`. We need access to this
from the integration tests, so install it onto the tests system.

Signed-off-by: Tom Gundersen <teg@jklm.no>

.github/workflows/tests.yml

@@ -84,10 +84,10 @@ jobs:
 
       - name: Run unit tests
         run: |
-          sudo internal/upload/koji/run-koji-container.sh start
+          sudo tools/run-koji-container.sh start
           koji --server=http://localhost:8080/kojihub --user kojiadmin --password kojipass --authtype=password make-task image
           env KRB5_CONFIG=../../../.github/krb5.conf go test -v -race -covermode atomic -coverprofile=coverage.txt -tags koji_test ./internal/upload/koji
-          sudo internal/upload/koji/run-koji-container.sh stop
+          sudo tools/run-koji-container.sh stop
 
       - name: Send coverage to codecov.io
         run: bash <(curl -s https://codecov.io/bash)

golang-github-osbuild-composer.spec

@@ -123,6 +123,7 @@ install -m 0755 -vp _bin/osbuild-image-tests                %{buildroot}%{_libex
 install -m 0755 -vp _bin/osbuild-auth-tests                 %{buildroot}%{_libexecdir}/tests/osbuild-composer/
 install -m 0755 -vp test/cmd/*                              %{buildroot}%{_libexecdir}/tests/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 -vd                                         %{buildroot}%{_datadir}/tests/osbuild-composer/ansible
 install -m 0644 -vp test/data/ansible/*                     %{buildroot}%{_datadir}/tests/osbuild-composer/ansible/

internal/upload/koji/README.md

@@ -3,7 +3,7 @@
 Firstly, you need to start the koji container:
 
 ```
-sudo ./internal/upload/koji/run-koji-container.sh start
+sudo ./tools/run-koji-container.sh start
 ```
 
 This command starts a kojihub instance available at
@@ -24,5 +24,5 @@ for more details.
 To stop and remove the koji container, use the following command:
 
 ```
-sudo ./internal/upload/koji/run-koji-container.sh stop
+sudo ./tools/koji/run-koji-container.sh stop
 ```

osbuild-composer.spec

@@ -161,6 +161,7 @@ install -m 0755 -vp _bin/osbuild-composer-cloud-tests           %{buildroot}%{_l
 install -m 0755 -vp _bin/osbuild-auth-tests                     %{buildroot}%{_libexecdir}/tests/osbuild-composer/
 install -m 0755 -vp test/cmd/*                                  %{buildroot}%{_libexecdir}/tests/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 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer/ansible
 install -m 0644 -vp test/data/ansible/*                         %{buildroot}%{_datadir}/tests/osbuild-composer/ansible/
@@ -302,6 +303,7 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %{_libexecdir}/tests/osbuild-composer/
 %{_datadir}/tests/osbuild-composer/
 %{_libexecdir}/osbuild-composer/image-info
+%{_libexecdir}/osbuild-composer/run-koji-container.sh
 
 %endif
 

test/cmd/koji.sh

@@ -35,7 +35,7 @@ if [[ $ID == rhel ]]; then
 fi
 
 greenprint "Starting containers"
-sudo ./internal/upload/koji/run-koji-container.sh start
+sudo /usr/libexec/osbuild-composer/run-koji-container.sh start
 
 greenprint "Copying custom worker config"
 sudo mkdir -p /etc/osbuild-worker
@@ -77,7 +77,7 @@ koji --server=http://localhost:8080/kojihub taskinfo 1
 koji --server=http://localhost:8080/kojihub buildinfo 1
 
 greenprint "Stopping containers"
-sudo ./internal/upload/koji/run-koji-container.sh stop
+sudo /usr/libexec/osbuild-composer/run-koji-container.sh stop
 
 greenprint "Removing generated CA cert"
 sudo rm \