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
37
e2e-tests/.ci/server.cloud_init.sh
Исполняемый файл
37
e2e-tests/.ci/server.cloud_init.sh
Исполняемый файл
@@ -0,0 +1,37 @@
|
||||
#!/bin/bash
|
||||
set -e -u -o pipefail
|
||||
cd "$(dirname "$0")"
|
||||
. .e2erc
|
||||
|
||||
if [ "$SERVER" != "cloud" ]; then
|
||||
mme2e_log "Skipping cloud instance initialization: operation supported only for cloud server, but running with SERVER='$SERVER'"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
mme2e_log "Initializing cloud tests"
|
||||
|
||||
# Assert that required variables are set
|
||||
MME2E_ENVCHECK_MSG="variable required for initializing cloud tests, but is empty or unset."
|
||||
: "${CWS_URL:?$MME2E_ENVCHECK_MSG}"
|
||||
: "${MM_LICENSE:?$MME2E_ENVCHECK_MSG}"
|
||||
|
||||
response=$(curl -X POST "${CWS_URL}/api/v1/internal/tests/create-customer?sku=cloud-enterprise&is_paid=true")
|
||||
MM_CUSTOMER_ID=$(echo "$response" | jq -r .customer_id)
|
||||
MM_CLOUD_API_KEY=$(echo "$response" | jq -r .api_key)
|
||||
MM_CLOUD_INSTALLATION_ID=$(echo "$response" | jq -r .installation_id)
|
||||
|
||||
export MM_CUSTOMER_ID=$MM_CUSTOMER_ID
|
||||
export MM_CLOUD_API_KEY=$MM_CLOUD_API_KEY
|
||||
export MM_CLOUD_INSTALLATION_ID=$MM_CLOUD_INSTALLATION_ID
|
||||
export MM_CLOUDSETTINGS_CWSURL=$CWS_URL
|
||||
export MM_CLOUDSETTINGS_CWSAPIURL=$CWS_URL
|
||||
|
||||
mme2e_generate_envfile_from_var_names >.env.cloud <<EOF
|
||||
MM_CLOUDSETTINGS_CWSURL
|
||||
MM_CLOUDSETTINGS_CWSAPIURL
|
||||
MM_CLOUD_API_KEY
|
||||
MM_CUSTOMER_ID
|
||||
MM_CLOUD_INSTALLATION_ID
|
||||
EOF
|
||||
|
||||
mme2e_log "Test cloud customer created, MM_CUSTOMER_ID: $MM_CUSTOMER_ID."
|
||||
Ссылка в новой задаче
Block a user