test: Fix installation of osbuild-worker.toml in provision.sh

The tools/provision.sh script is sourced by all test cases and it sets
up the system and software for running test cases. As part of the setup,
it copied over the whole content of test/data/composer/ to
/etc/osbuild-composer. However the source directory contains not only
osbuild-composer's configuration, but also configuration for the worker.
The worker however expects its configuration in /etc/osbuild-worker.

The fact that provision.sh does not copy the worker configuration to the
correct directory didn't affect the CI, because the only test case that
relied on it is koji.sh, which copies the worker configuration
explicitly.

Move osbuild-worker test configuration to a separate 'test/data/worker/'
subdirectory. Also install the osbuild-worker test configuration to its
own subdirectory in the "-test" RPM.

Move the copying of worker configuration to the correct destination
directory from koji.sh to provision.sh, so that all test cases can rely
on the system being set up properly. Do not use wildcard for copying
osbuild-{composer,worker} configuration files, but explicitly copy each
file to its respective destination directory.

Signed-off-by: Tomas Hozza <thozza@redhat.com>

osbuild-composer.spec

@@ -204,6 +204,9 @@ install -m 0644 -vp test/data/cloud-init/*                      %{buildroot}%{_d
 install -m 0755 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer/composer
 install -m 0644 -vp test/data/composer/*                        %{buildroot}%{_datadir}/tests/osbuild-composer/composer/
 
+install -m 0755 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer/worker
+install -m 0644 -vp test/data/worker/*                          %{buildroot}%{_datadir}/tests/osbuild-composer/worker/
+
 install -m 0755 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer/repositories
 install -m 0644 -vp test/data/repositories/*                    %{buildroot}%{_datadir}/tests/osbuild-composer/repositories/
 

test/cases/koji.sh

@@ -27,11 +27,6 @@ fi
 greenprint "Starting containers"
 sudo /usr/libexec/osbuild-composer-test/run-koji-container.sh start
 
-greenprint "Copying custom worker config"
-sudo mkdir -p /etc/osbuild-worker
-sudo cp "${OSBUILD_COMPOSER_TEST_DATA}"/composer/osbuild-worker.toml \
-    /etc/osbuild-worker/
-
 greenprint "Adding kerberos config"
 sudo cp \
     /tmp/osbuild-composer-koji-test/client.keytab \

tools/provision.sh

@@ -12,9 +12,13 @@ if [[ $ID == rhel || $ID == centos ]]; then
 fi
 
 sudo mkdir -p /etc/osbuild-composer
-sudo cp -a /usr/share/tests/osbuild-composer/composer/*.toml \
+sudo cp -a /usr/share/tests/osbuild-composer/composer/osbuild-composer.toml \
     /etc/osbuild-composer/
 
+sudo mkdir -p /etc/osbuild-worker
+sudo cp -a /usr/share/tests/osbuild-composer/worker/osbuild-worker.toml \
+    /etc/osbuild-worker/
+
 # Copy rpmrepo snapshots for use in weldr tests
 sudo mkdir -p /etc/osbuild-composer/repositories
 # Copy all fedora repo overrides