diff --git a/osbuild-composer.spec b/osbuild-composer.spec index d028c46e7..0470e2c9b 100644 --- a/osbuild-composer.spec +++ b/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/ diff --git a/test/cases/koji.sh b/test/cases/koji.sh index 89e949a81..b326fd6ae 100755 --- a/test/cases/koji.sh +++ b/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 \ diff --git a/test/data/composer/osbuild-worker.toml b/test/data/worker/osbuild-worker.toml similarity index 100% rename from test/data/composer/osbuild-worker.toml rename to test/data/worker/osbuild-worker.toml diff --git a/tools/provision.sh b/tools/provision.sh index 29fec71c4..eaf7e5881 100755 --- a/tools/provision.sh +++ b/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