From 452bb1d1e77aa2025466d1823239808409d25a87 Mon Sep 17 00:00:00 2001 From: keskiju Date: Sun, 12 Jan 2025 22:27:48 +0200 Subject: [PATCH] feat(docker): prefer docker-compose-cicd.yaml for running tests --- plugins/docker/util-test-50 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/docker/util-test-50 b/plugins/docker/util-test-50 index 01ebab75..1e3bef3e 100755 --- a/plugins/docker/util-test-50 +++ b/plugins/docker/util-test-50 @@ -73,12 +73,14 @@ export_env_vars="\ # Determine pod docker-compose::expose_pod_and_container -docker_compose_test_file=docker-compose-cicd.yaml -docker_compose_test_suffix="-cicd" if [[ -f "./docker-compose-test.yaml" ]]; then docker_compose_test_file=docker-compose-test.yaml docker_compose_test_suffix="-test" fi +if [[ -f "./docker-compose-cicd.yaml" ]]; then + docker_compose_test_file=docker-compose-cicd.yaml + docker_compose_test_suffix="-cicd" +fi if [[ -f "./docker-compose-cicd-${taito_ci_provider:-}.yaml" ]]; then docker_compose_test_file="docker-compose-cicd-${taito_ci_provider}.yaml" fi