From afb27d07083bec0a894d78ac4ffdd928ba96055b Mon Sep 17 00:00:00 2001 From: Bianca Lisle Date: Mon, 8 Sep 2025 08:26:43 +0100 Subject: [PATCH 1/3] fix: default to cloud-dev --- scripts/add-e2e-profiles.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/add-e2e-profiles.sh b/scripts/add-e2e-profiles.sh index 1d47300422..9931c408a2 100755 --- a/scripts/add-e2e-profiles.sh +++ b/scripts/add-e2e-profiles.sh @@ -20,10 +20,10 @@ set -euo pipefail # Prompt if user wants to use cloud-dev.mongodb.com read -p "Do you want to set ops_manager_url to cloud-dev.mongodb.com? [Y/n] " -n 1 -r echo -if [[ $REPLY =~ ^[Yy]$ ]]; then - ops_manager_url="https://cloud-dev.mongodb.com/" +if [[ -z "$REPLY" || $REPLY =~ ^[Yy]$ ]]; then + ops_manager_url="https://cloud-dev.mongodb.com/" # Default to cloud-dev.mongodb.com else - ops_manager_url="https://cloud.mongodb.com/" # Default to cloud.mongodb.com + ops_manager_url="https://cloud.mongodb.com/" fi ./bin/atlas config set ops_manager_url $ops_manager_url -P __e2e From 9af8bf6c3e05868864906621c05eecae8a7cd9cb Mon Sep 17 00:00:00 2001 From: Bianca Lisle Date: Mon, 8 Sep 2025 08:28:57 +0100 Subject: [PATCH 2/3] fix: updates cleanup setup --- .github/workflows/update-e2e-tests.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update-e2e-tests.yml b/.github/workflows/update-e2e-tests.yml index 09d78ee1ec..81e08fee66 100644 --- a/.github/workflows/update-e2e-tests.yml +++ b/.github/workflows/update-e2e-tests.yml @@ -177,11 +177,11 @@ jobs: skip_update_check = true [__e2e] - org_id = '${{ secrets.MONGODB_ATLAS_ORG_ID }}' - project_id = '${{ secrets.MONGODB_ATLAS_PROJECT_ID }}' - public_api_key = '${{ secrets.MONGODB_ATLAS_PROJECT_ID }}' - private_api_key = '${{ secrets.MONGODB_ATLAS_PRIVATE_API_KEY }}' - ops_manager_url = '${{ secrets.MONGODB_ATLAS_OPS_MANAGER_URL }}' + org_id = 'a0123456789abcdef012345a' + project_id = 'b0123456789abcdef012345b' + public_api_key = 'ABCDEF01' + private_api_key = '12345678-abcd-ef01-2345-6789abcdef01' + ops_manager_url = 'http://localhost:8080/' service = 'cloud' telemetry_enabled = false output = 'plaintext' @@ -197,6 +197,11 @@ jobs: output = 'plaintext' run: | echo "$CONFIG_CONTENT" > "$CONFIG_PATH" + ./bin/atlas config set org_id "$MONGODB_ATLAS_ORG_ID" -P __e2e + ./bin/atlas config set project_id "$MONGODB_ATLAS_PROJECT_ID" -P __e2e + ./bin/atlas config set public_api_key "$MONGODB_ATLAS_PUBLIC_API_KEY" -P __e2e + ./bin/atlas config set private_api_key "$MONGODB_ATLAS_PRIVATE_API_KEY" -P __e2e + ./bin/atlas config set ops_manager_url "$MONGODB_ATLAS_OPS_MANAGER_URL" -P __e2e - run: make e2e-test env: TEST_CMD: gotestsum --junitfile e2e-tests.xml --format standard-verbose -- @@ -211,6 +216,9 @@ jobs: AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }} + MONGODB_ATLAS_ORG_ID: ${{ secrets.MONGODB_ATLAS_ORG_ID }} + MONGODB_ATLAS_PROJECT_ID: ${{ secrets.MONGODB_ATLAS_PROJECT_ID }} + MONGODB_ATLAS_OPS_MANAGER_URL: ${{ secrets.MONGODB_ATLAS_OPS_MANAGER_URL }} E2E_TIMEOUT: 3h - name: Test Summary if: always() From f4df09847ae9743044d7cbe14835fd7bd0575645 Mon Sep 17 00:00:00 2001 From: Bianca Lisle Date: Mon, 8 Sep 2025 08:29:56 +0100 Subject: [PATCH 3/3] fix: update config --- .github/workflows/code-health.yml | 3 +-- .github/workflows/update-e2e-tests.yml | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml index d9d227b3e9..d6a57cd85c 100644 --- a/.github/workflows/code-health.yml +++ b/.github/workflows/code-health.yml @@ -341,6 +341,7 @@ jobs: CONFIG_PATH: ${{ steps.config-path.outputs.CONFIG_PATH }} CONFIG_CONTENT: | skip_update_check = true + telemetry_enabled = false [__e2e] org_id = 'a0123456789abcdef012345a' @@ -349,7 +350,6 @@ jobs: private_api_key = '12345678-abcd-ef01-2345-6789abcdef01' ops_manager_url = 'http://localhost:8080/' service = 'cloud' - telemetry_enabled = false output = 'plaintext' [__e2e_snapshot] @@ -359,7 +359,6 @@ jobs: private_api_key = '12345678-abcd-ef01-2345-6789abcdef01' ops_manager_url = 'http://localhost:8080/' service = 'cloud' - telemetry_enabled = false output = 'plaintext' run: | echo "$CONFIG_CONTENT" > "$CONFIG_PATH" diff --git a/.github/workflows/update-e2e-tests.yml b/.github/workflows/update-e2e-tests.yml index 81e08fee66..3e83e759ee 100644 --- a/.github/workflows/update-e2e-tests.yml +++ b/.github/workflows/update-e2e-tests.yml @@ -84,6 +84,7 @@ jobs: CONFIG_PATH: ${{ steps.config-path.outputs.CONFIG_PATH }} CONFIG_CONTENT: | skip_update_check = true + telemetry_enabled = false [__e2e] org_id = 'a0123456789abcdef012345a' @@ -92,7 +93,6 @@ jobs: private_api_key = '12345678-abcd-ef01-2345-6789abcdef01' ops_manager_url = 'http://localhost:8080/' service = 'cloud' - telemetry_enabled = false output = 'plaintext' [__e2e_snapshot] @@ -102,7 +102,6 @@ jobs: private_api_key = '12345678-abcd-ef01-2345-6789abcdef01' ops_manager_url = 'http://localhost:8080/' service = 'cloud' - telemetry_enabled = false output = 'plaintext' MONGODB_ATLAS_ORG_ID: ${{ secrets.MONGODB_ATLAS_ORG_ID }} MONGODB_ATLAS_PROJECT_ID: ${{ secrets.MONGODB_ATLAS_PROJECT_ID }} @@ -175,6 +174,7 @@ jobs: CONFIG_PATH: ${{ steps.config-path.outputs.CONFIG_PATH }} CONFIG_CONTENT: | skip_update_check = true + telemetry_enabled = false [__e2e] org_id = 'a0123456789abcdef012345a' @@ -183,7 +183,6 @@ jobs: private_api_key = '12345678-abcd-ef01-2345-6789abcdef01' ops_manager_url = 'http://localhost:8080/' service = 'cloud' - telemetry_enabled = false output = 'plaintext' [__e2e_snapshot] @@ -193,7 +192,6 @@ jobs: private_api_key = '12345678-abcd-ef01-2345-6789abcdef01' ops_manager_url = 'http://localhost:8080/' service = 'cloud' - telemetry_enabled = false output = 'plaintext' run: | echo "$CONFIG_CONTENT" > "$CONFIG_PATH"