From bb3b518d0da9a8012dd620d5872f3a673759b0cf Mon Sep 17 00:00:00 2001 From: Philip Date: Fri, 7 Jun 2024 09:49:12 +0200 Subject: [PATCH] ensure that the .lagoon.yaml file on moduletest matches the one one main --- infrastructure/dpladm/bin/dpladm-shared.source | 2 +- infrastructure/dpladm/bin/sync-site.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure/dpladm/bin/dpladm-shared.source b/infrastructure/dpladm/bin/dpladm-shared.source index 5729b0b1..69c2c8f5 100755 --- a/infrastructure/dpladm/bin/dpladm-shared.source +++ b/infrastructure/dpladm/bin/dpladm-shared.source @@ -97,8 +97,8 @@ EndOfMessage fi # Only render secondary domains if we have a primary domain. + SECONDARY_DOMAINS="" if [[ -n "${primaryDomain}" && -n "${secondaryDomainsString}" ]]; then - SECONDARY_DOMAINS="" IFS=' ' for secondaryDomain in ${secondaryDomainsString}; do SECONDARY_DOMAINS+=$(cat << EndOfMessage diff --git a/infrastructure/dpladm/bin/sync-site.sh b/infrastructure/dpladm/bin/sync-site.sh index 3caa4c3b..1f74e3e0 100755 --- a/infrastructure/dpladm/bin/sync-site.sh +++ b/infrastructure/dpladm/bin/sync-site.sh @@ -150,5 +150,5 @@ set -o errexit syncEnvRepo "${SITE}" "${releaseTag}" "${BRANCH}" "${siteImageRepository}" "${siteReleaseImageName}" "${importTranslationsCron}" "${autogenerateRoutes}" "${primaryDomain}" "${secondaryDomains}" if [ "${plan}" = "webmaster" ] && [ "${BRANCH}" = "main" ]; then - syncEnvRepo "${SITE}" "${releaseTag}" "moduletest" "${siteImageRepository}" "${siteReleaseImageName}" "${importTranslationsCron}" + syncEnvRepo "${SITE}" "${releaseTag}" "moduletest" "${siteImageRepository}" "${siteReleaseImageName}" "${importTranslationsCron}" "${autogenerateRoutes}" "${primaryDomain}" "${secondaryDomains}" fi