Skip to content

TOOLS-4235 More Evergreen config cleanup #1023

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

Open
autarch wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −20
Open

TOOLS-4235 More Evergreen config cleanup #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,16 @@ variables:
"--sslMode requireSSL --sslCAFile common/db/testdata/ca-ia.pem --sslPEMKeyFile
common/db/testdata/test-server.pem"
replsettest_ssl_config:
"sslMode: \\\"requireSSL\\\",sslPEMKeyFile: \\\"common/db/testdata/test-server.pem\\\",
sslCAFile: \\\"common/db/testdata/ca-ia.pem\\\", sslAllowInvalidHostnames: \\\"\\\""
'sslMode: "requireSSL",sslPEMKeyFile: "common/db/testdata/test-server.pem", sslCAFile:
"common/db/testdata/ca-ia.pem", sslAllowInvalidHostnames: ""'
mongod_port: 33333
tls: &mongod_tls_startup_args
mongod_args_tls:
"--tlsMode requireTLS --tlsCAFile common/db/testdata/ca-ia.pem --tlsCertificateKeyFile
common/db/testdata/test-server.pem"
replsettest_tls_config:
"tlsMode: \\\"requireTLS\\\",tlsCertificateKeyFile:
\\\"common/db/testdata/test-server.pem\\\", tlsCAFile: \\\"common/db/testdata/ca-ia.pem\\\",
tlsAllowInvalidHostnames: \\\"\\\""
'tlsMode: "requireTLS",tlsCertificateKeyFile: "common/db/testdata/test-server.pem",
tlsCAFile: "common/db/testdata/ca-ia.pem", tlsAllowInvalidHostnames: ""'
mongod_port: 33333

mongo_arguments:
Expand Down Expand Up @@ -648,10 +647,10 @@ functions:
NODE_OPTIONS=""
mkdir -p /data/db/
if [ "${USE_TLS}" = "true" ]; then
NODE_OPTIONS="${replsettest_tls_config}"
NODE_OPTIONS='${replsettest_tls_config}'

@mmcclimon mmcclimon Jul 10, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I am a little surprised this works? I would expect this to set NODE_OPTIONS to the literal string ${replsettest_tls_config}. Clearly I'm wrong, though, so chalking this up to evergreen + yaml + bash code in string is not the best way to write programs.

MONGO_ARGS="${mongo_args_tls}"
elif [ "${USE_SSL}" = "true" ]; then
NODE_OPTIONS="${replsettest_ssl_config}"
NODE_OPTIONS='${replsettest_ssl_config}'
fi
# use jsconfig.json to set baseUrl to find libs
mv test/shell_common/jsconfig.json ./
Expand Down
3 changes: 0 additions & 3 deletions etc/evergreen-validate-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ if grep --quiet "is valid with warnings" "$TEMP_FILE"; then
"WARNING: task 'commit-queue-workaround' defined but not used by any variants; consider using or disabling")
continue
;;
"WARNING: task 'deliberate_fail_to_test_build_baron_context_rules' defined but not used by any variants; consider using or disabling")
continue
;;
"WARNING: task 't_resmoke_setup' defined but not used by any variants; consider using or disabling")
continue
;;
Expand Down
10 changes: 0 additions & 10 deletions mongodump_passthrough/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@ tasks:
script: |
echo "This task is a no-op to work around evergreen's commit queue behavior"

- name: deliberate_fail_to_test_build_baron_context_rules
commands:
- command: shell.exec
params:
script: |
echo "Deliberate fail test should give BF on mongodump_passthrough context"
echo "exit 1"
exit 1
patch_only: true

# For mongodump passthrough, this builds and uploads the mongodump and mongorestore
# binaries (but without coverage), and uploads them. The name "compile_coverage"
# is misleading, but that task name is used in the generated tasks from mongodump-task-gen
Expand Down