Skip to content
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

chore(ci): move e2e secrets to their own anchor #6627

Merged
merged 2 commits into from
Jan 17, 2025
Merged

chore(ci): move e2e secrets to their own anchor #6627

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c43a4b7
chore(ci): move e2e secrets to their own anchor
gribnoysup Jan 17, 2025
cf2aef8
chore(ci): move signing secrets to signing task; do not run connectiv…
gribnoysup Jan 17, 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
25 changes: 14 additions & 11 deletions .evergreen/functions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,12 @@ variables:
# secrets
HADRON_METRICS_INTERCOM_APP_ID: ${metrics_intercom_app_id}
HADRON_METRICS_SEGMENT_API_KEY: ${metrics_segment_api_key}
MACOS_NOTARY_KEY: ${macos_notary_key}
MACOS_NOTARY_SECRET: ${macos_notary_secret}
MACOS_NOTARY_CLIENT_URL: 'https://macos-notary-1628249594.s3.amazonaws.com/releases/client/latest/darwin_amd64.zip'
MACOS_NOTARY_API_URL: 'https://dev.macos-notary.build.10gen.cc/api'
GITHUB_TOKEN: ${devtoolsbot_github_token}
DOWNLOAD_CENTER_AWS_ACCESS_KEY_ID: ${aws_key_evergreen_integrations}
DOWNLOAD_CENTER_AWS_SECRET_ACCESS_KEY: ${aws_secret_evergreen_integrations}
EVERGREEN_BUCKET_NAME: mciuploads
EVERGREEN_BUCKET_KEY_PREFIX: ${project}/${revision}_${revision_order_id}
MONGODB_RUNNER_LOG_DIR: ${workdir}/src/.testserver/
GARASIGN_USERNAME: ${garasign_username}
GARASIGN_PASSWORD: ${garasign_password}
ARTIFACTORY_USERNAME: ${artifactory_username}
ARTIFACTORY_PASSWORD: ${artifactory_password}
DOCKERHUB_USERNAME: ${dockerhub_username}
DOCKERHUB_PASSWORD: ${dockerhub_password}
- &compass-e2e-secrets
Expand Down Expand Up @@ -460,12 +452,25 @@ functions:
<<: *compass-env
DEBUG: ${debug}
npm_config_loglevel: ${npm_loglevel}
HADRON_DISTRIBUTION: ${compass_distribution}

# macOS signing secrets
MACOS_NOTARY_KEY: ${macos_notary_key}
MACOS_NOTARY_SECRET: ${macos_notary_secret}
MACOS_NOTARY_CLIENT_URL: 'https://macos-notary-1628249594.s3.amazonaws.com/releases/client/latest/darwin_amd64.zip'
MACOS_NOTARY_API_URL: 'https://dev.macos-notary.build.10gen.cc/api'

# linux / windows signing secrets
GARASIGN_USERNAME: ${garasign_username}
GARASIGN_PASSWORD: ${garasign_password}
ARTIFACTORY_USERNAME: ${artifactory_username}
ARTIFACTORY_PASSWORD: ${artifactory_password}
SIGNING_SERVER_HOSTNAME: ${SIGNING_SERVER_HOSTNAME}
SIGNING_SERVER_PRIVATE_KEY: ${SIGNING_SERVER_PRIVATE_KEY}
SIGNING_SERVER_PRIVATE_KEY_CYGPATH: ${SIGNING_SERVER_PRIVATE_KEY_CYGPATH}
SIGNING_SERVER_USERNAME: ${SIGNING_SERVER_USERNAME}
SIGNING_SERVER_PORT: ${SIGNING_SERVER_PORT}

HADRON_DISTRIBUTION: ${compass_distribution}
GITHUB_PR_NUMBER: ${github_pr_number}
PAPERTRAIL_KEY_ID: ${papertrail_key_id}
PAPERTRAIL_SECRET_KEY: ${papertrail_secret_key}
Expand Down Expand Up @@ -696,7 +701,6 @@ functions:
# TODO: rhel_tar
#fi


test-web-sandbox:
- command: shell.exec
# Fail the task if it's idle for 10 mins
Expand All @@ -721,7 +725,6 @@ functions:
eval $(.evergreen/print-compass-env.sh)
npm run --unsafe-perm --workspace compass-e2e-tests test-ci web


test-web-sandbox-atlas-cloud:
- command: shell.exec
# It can take a very long time for Atlas cluster to get deployed
Expand Down
2 changes: 1 addition & 1 deletion packages/data-service/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"test-csfle": "mocha ./src/csfle-collection-tracker.spec.ts ./src/data-service.spec.ts",
"test-cov": "nyc --compact=false --produce-source-map=false -x \"**/*.spec.*\" --reporter=lcov --reporter=text --reporter=html npm run test",
"test-watch": "npm run test -- --watch",
"test-ci": "npm run test-cov",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid running those twice in CI, not that it's very big deal, but also means we don't need to pass those e2e secrets to unit tests

"test-ci": "npm run test-cov -- -- --include \"./**/*.{spec,test}.*\" --exclude \"./src/connect.spec.ts\" --exclude \"./src/csfle-collection-tracker.spec.ts\"",
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
},
"dependencies": {
Expand Down
Loading