test: suffix the currently used test configurations with -tls

This is a preparation to support a different authentication method in
`provision.sh`, specifically JWT.
This commit is contained in:
Tomas Hozza 2022-07-20 14:16:24 +02:00 committed by Ondřej Budai
parent 444f85ac5c
commit 036303694c
4 changed files with 6 additions and 6 deletions

View file

@ -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

View file

@ -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:-}"