Skip to content

CLOUDP-342259: Fix e2e test clean up #4193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 8, 2025
Merged

CLOUDP-342259: Fix e2e test clean up #4193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afb27d0
fix: default to cloud-dev
blva Sep 8, 2025
9af8bf6
fix: updates cleanup setup
blva Sep 8, 2025
f4df098
fix: update config
blva Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/code-health.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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]
Expand All @@ -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"
Expand Down
24 changes: 15 additions & 9 deletions .github/workflows/update-e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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]
Expand All @@ -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 }}
Expand Down Expand Up @@ -175,15 +174,15 @@ jobs:
CONFIG_PATH: ${{ steps.config-path.outputs.CONFIG_PATH }}
CONFIG_CONTENT: |
skip_update_check = true
telemetry_enabled = false

[__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'

[__e2e_snapshot]
Expand All @@ -193,10 +192,14 @@ 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"
./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 --
Expand All @@ -211,6 +214,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()
Expand Down
6 changes: 3 additions & 3 deletions scripts/add-e2e-profiles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading