CLD-5699 Preliminary fixes (#25040)
* Rework some of PR24647 * Store MM_LICENSE to .env.server file * Remove legacy network setup * Fixes, generate docker-compose and env files in one place * Simplify templating mechanism for server.yml * Fix race condition for dashboard start * Fix websockets for local debugging * Fix: make webhook-interaction work again * Simplify and fix dashboard&cloud configuration, formatting fix --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
b0bf5d0765
Коммит
42b3ef0238
@@ -2,7 +2,6 @@
|
||||
set -e -u -o pipefail
|
||||
cd "$(dirname "$0")"
|
||||
. .e2erc
|
||||
. .e2erc_setup
|
||||
|
||||
MME2E_DASHBOARD_REF_DEFAULT="origin/main"
|
||||
MME2E_DASHBOARD_REF=${MME2E_DASHBOARD_REF:-$MME2E_DASHBOARD_REF_DEFAULT}
|
||||
@@ -12,7 +11,6 @@ if [ ! -d dashboard ]; then
|
||||
git clone https://github.com/saturninoabril/automation-dashboard.git dashboard
|
||||
# Must reinitialize some variables that depend on the dashboard repo being checked out
|
||||
. .e2erc
|
||||
. .e2erc_setup
|
||||
fi
|
||||
git -C dashboard fetch
|
||||
git -C dashboard checkout "$MME2E_DASHBOARD_REF"
|
||||
@@ -20,6 +18,11 @@ git -C dashboard checkout "$MME2E_DASHBOARD_REF"
|
||||
mme2e_log "Starting the dashboard"
|
||||
${MME2E_DC_DASHBOARD} up -d db dashboard
|
||||
|
||||
if ! DC_COMMAND="${MME2E_DC_DASHBOARD}" mme2e_wait_service_healthy dashboard 60 10; then
|
||||
mme2e_log "Dashboard container not healthy, retry attempts exhausted. Giving up." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mme2e_log "Generating the dashboard's local URL"
|
||||
case $MME2E_OSTYPE in
|
||||
darwin)
|
||||
@@ -36,7 +39,7 @@ esac
|
||||
AUTOMATION_DASHBOARD_URL="http://${AUTOMATION_DASHBOARD_IP}:4000/api"
|
||||
|
||||
mme2e_log "Generating a signed JWT token for accessing the dashboard"
|
||||
${MME2E_DC_DASHBOARD} exec -T dashboard bash -c "rm -rf node_modules && npm install --cache /tmp/empty-cache"
|
||||
# Not running 'npm install'. We assume it has been run by the dashboard container's entrypoint
|
||||
# shellcheck disable=SC2034
|
||||
AUTOMATION_DASHBOARD_TOKEN=$(${MME2E_DC_DASHBOARD} exec -T dashboard node script/sign.js | awk '{ print $2; }') # The token secret is specified in the dashboard.override.yml file
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user