From 036303694c8e4a3429d5950827cbb4265ff1578a Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Wed, 20 Jul 2022 14:16:24 +0200
Subject: [PATCH] test: suffix the currently used test configurations with
 `-tls`

This is a preparation to support a different authentication method in
`provision.sh`, specifically JWT.
---
 distribution/Dockerfile-config                            | 4 ++--
 .../{osbuild-composer.toml => osbuild-composer-tls.toml}  | 0
 .../{osbuild-worker.toml => osbuild-worker-tls.toml}      | 0
 tools/provision.sh                                        | 8 ++++----
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename test/data/composer/{osbuild-composer.toml => osbuild-composer-tls.toml} (100%)
 rename test/data/worker/{osbuild-worker.toml => osbuild-worker-tls.toml} (100%)

diff --git a/distribution/Dockerfile-config b/distribution/Dockerfile-config
index 20d2a9834..8ea6c5864 100644
--- a/distribution/Dockerfile-config
+++ b/distribution/Dockerfile-config
@@ -5,7 +5,7 @@ RUN dnf -y install \
 
 COPY ./tools/gen-certs.sh .
 COPY ./test/data/x509/openssl.cnf .
-COPY ./test/data/composer/osbuild-composer.toml /config/
-COPY ./test/data/worker/osbuild-worker.toml /config/
+COPY ./test/data/composer/osbuild-composer-tls.toml /config/
+COPY ./test/data/worker/osbuild-worker-tls.toml /config/
 COPY ./repositories /config/repositories/
 RUN ./gen-certs.sh ./openssl.cnf /config  /config/ca
diff --git a/test/data/composer/osbuild-composer.toml b/test/data/composer/osbuild-composer-tls.toml
similarity index 100%
rename from test/data/composer/osbuild-composer.toml
rename to test/data/composer/osbuild-composer-tls.toml
diff --git a/test/data/worker/osbuild-worker.toml b/test/data/worker/osbuild-worker-tls.toml
similarity index 100%
rename from test/data/worker/osbuild-worker.toml
rename to test/data/worker/osbuild-worker-tls.toml
diff --git a/tools/provision.sh b/tools/provision.sh
index 680d860e9..a3848855c 100755
--- a/tools/provision.sh
+++ b/tools/provision.sh
@@ -34,12 +34,12 @@ if [[ "$VERSION_ID" == "9.0" || "$VERSION_ID" == "9" ]]; then
 fi
 
 sudo mkdir -p /etc/osbuild-composer
-sudo cp -a /usr/share/tests/osbuild-composer/composer/osbuild-composer.toml \
-    /etc/osbuild-composer/
+sudo cp -a /usr/share/tests/osbuild-composer/composer/osbuild-composer-tls.toml \
+    /etc/osbuild-composer/osbuild-composer.toml
 
 sudo mkdir -p /etc/osbuild-worker
-sudo cp -a /usr/share/tests/osbuild-composer/worker/osbuild-worker.toml \
-    /etc/osbuild-worker/
+sudo cp -a /usr/share/tests/osbuild-composer/worker/osbuild-worker-tls.toml \
+    /etc/osbuild-worker/osbuild-worker.toml
 
 # if GCP credentials are defined in the ENV, add them to the worker's configuration
 GOOGLE_APPLICATION_CREDENTIALS="${GOOGLE_APPLICATION_CREDENTIALS:-}"