From 28aff2259a186e35e63e65c31046f869cfa6d105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <obudai@redhat.com>
Date: Wed, 23 Sep 2020 08:43:26 +0200
Subject: [PATCH] schutzbot: start also the remote socket

The following commits will add testing of authentication on this socket.

This commit also sets up the config for composer other it won't start
with remote socket enabled.
---
 schutzbot/deploy.sh      | 7 +++++++
 test/image-tests/koji.sh | 5 +----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh
index 48c07c442..ac6762019 100755
--- a/schutzbot/deploy.sh
+++ b/schutzbot/deploy.sh
@@ -76,11 +76,18 @@ if [[ -f "rhel-8-beta.json" ]]; then
     sudo cp rhel-8-beta.json /etc/osbuild-composer/repositories/
 fi
 
+greenprint "Copying custom composer config"
+# Remote worker needs this
+sudo mkdir -p /etc/osbuild-composer
+sudo cp test/image-tests/osbuild-composer.toml \
+    /etc/osbuild-composer/
+
 greenprint "Generating SSL certificates"
 sudo make composer-key-pair
 sudo make worker-key-pair
 
 greenprint "Starting services"
+sudo systemctl enable --now osbuild-remote-worker.socket
 sudo systemctl enable --now osbuild-composer.socket
 sudo systemctl enable --now osbuild-composer-koji.socket
 
diff --git a/test/image-tests/koji.sh b/test/image-tests/koji.sh
index d045eaf72..053668815 100755
--- a/test/image-tests/koji.sh
+++ b/test/image-tests/koji.sh
@@ -35,10 +35,7 @@ fi
 greenprint "Starting containers"
 sudo ./internal/upload/koji/run-koji-container.sh start
 
-greenprint "Copying custom composer/worker config"
-sudo mkdir -p /etc/osbuild-composer
-sudo cp test/image-tests/osbuild-composer.toml \
-    /etc/osbuild-composer/
+greenprint "Copying custom worker config"
 sudo mkdir -p /etc/osbuild-worker
 sudo cp test/image-tests/osbuild-worker.toml \
     /etc/osbuild-worker/