diff --git a/deploy/scripts/tests/upload-and-deploy.test.sh b/deploy/scripts/tests/upload-and-deploy.test.sh index 1131ebe..79d18a8 100644 --- a/deploy/scripts/tests/upload-and-deploy.test.sh +++ b/deploy/scripts/tests/upload-and-deploy.test.sh @@ -101,6 +101,7 @@ output="$( "$UPLOAD_SCRIPT" \ --host 203.0.113.10 \ --identity "$TEST_IDENTITY" \ + --go-live \ 2>&1 )" status=$? @@ -120,6 +121,9 @@ assert_contains \ "Commit $REVISION ist auf dem Server aktiv." \ "$output" assert_contains "sleep|5" "$(<"$FAKE_LOG")" +assert_contains \ + "WATERMAPS_ENV_FILE=/opt/watermaps/deploy/.env.production WATERMAPS_IMAGES_ENV_FILE=/opt/watermaps/deploy/.env.images /opt/watermaps/current/deploy/scripts/go-live.sh '203.0.113.10'" \ + "$(<"$FAKE_LOG")" NEWER_REVISION="4444444444444444444444444444444444444444" set +e diff --git a/deploy/scripts/upload-and-deploy.sh b/deploy/scripts/upload-and-deploy.sh index fc47ade..c869b23 100755 --- a/deploy/scripts/upload-and-deploy.sh +++ b/deploy/scripts/upload-and-deploy.sh @@ -222,7 +222,7 @@ wait_for_remote_release "$revision" if [[ "$run_go_live" == "true" ]]; then ssh "${WM_SSH_OPTIONS[@]}" "$WM_SSH_TARGET" \ - "${remote_prefix}WATERMAPS_ENV_FILE=/opt/watermaps/deploy/.env.production /opt/watermaps/current/deploy/scripts/go-live.sh '$WM_SERVER_IPV4'" + "${remote_prefix}WATERMAPS_ENV_FILE=/opt/watermaps/deploy/.env.production WATERMAPS_IMAGES_ENV_FILE=/opt/watermaps/deploy/.env.images /opt/watermaps/current/deploy/scripts/go-live.sh '$WM_SERVER_IPV4'" else printf '[watermaps] Commit %s wurde aus der Registry deployt. Nach dem DNS-Eintrag:\n' "$revision" printf ' ./deploy/scripts/remote-go-live.sh --host %s\n' "$WM_SERVER_IPV4"