debugging

.evergreen/config.yml

@@ -40,7 +40,7 @@ functions:
  # Make an evergreen expansion file with dynamic values
  - command: subprocess.exec
  params:
- include_expansions_in_env: ["is_patch", "project", "version_id", "AUTH", "SSL", "PYTHON_BINARY", "test_encryption", "test_encryption_pyopenssl", "test_crypt_shared", "test_pyopenssl", "SETDEFAULTENCODING", "test_loadbalancer", "test_serverless", "TEST_INDEX_MANAGEMENT", "SKIP_CSOT_TESTS", "MONGODB_STARTED", "DISABLE_TEST_COMMANDS", "GREEN_FRAMEWORK", "NO_EXT", "COVERAGE", "COMPRESSORS", "TEST_DATA_LAKE", "TEST_SUITES", "MONGODB_API_VERSION", "SKIP_HATCH", "skip_crypt_shared", "VERSION", "TOPOLOGY", "STORAGE_ENGINE", "ORCHESTRATION_FILE", "REQUIRE_API_VERSION", "LOAD_BALANCER"]
+ include_expansions_in_env: ["is_patch", "project", "version_id", "AUTH", "SSL", "PYTHON_BINARY", "test_encryption", "test_encryption_pyopenssl", "test_crypt_shared", "test_pyopenssl", "SETDEFAULTENCODING", "test_loadbalancer", "test_serverless", "SKIP_CSOT_TESTS", "MONGODB_STARTED", "DISABLE_TEST_COMMANDS", "GREEN_FRAMEWORK", "NO_EXT", "COVERAGE", "COMPRESSORS", "TEST_SUITES", "MONGODB_API_VERSION", "SKIP_HATCH", "skip_crypt_shared", "VERSION", "TOPOLOGY", "STORAGE_ENGINE", "ORCHESTRATION_FILE", "REQUIRE_API_VERSION", "LOAD_BALANCER"]
  binary: bash
  working_dir: "src"
  args:
@@ -85,7 +85,7 @@ functions:
  working_dir: "src"
  include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
  args:
- - src/.evergreen/scripts/download-and-merge-coverage.sh
+ - .evergreen/scripts/download-and-merge-coverage.sh
  - ${bucket_name}
  - ${revision}
  - ${version_id}
@@ -227,6 +227,7 @@ functions:
  - command: subprocess.exec
  params:
  binary: bash
+ include_expansions_in_env: ["VERSION", "TOPOLOGY"]
  args:
  - src/.evergreen/scripts/run-with-env.sh
  - src/.evergreen/scripts/bootstrap-mongo-orchestration.sh
@@ -305,7 +306,7 @@ functions:
  params:
  working_dir: "src"
  binary: bash
- include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
+ include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "TEST_DATA_LAKE", "TEST_INDEX_MANAGEMENT", "test_serverless", "CRYPT_SHARED_LIB_PATH"]
  args:
  - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-tests.sh

.evergreen/scripts/configure-env.sh

@@ -29,7 +29,7 @@ fi
 export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
 export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
 
-cat <<EOT > $SCRIPT_DIR/env.sh
+cat <<EOT > "$SCRIPT_DIR"/env.sh
 set -o errexit
 export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
 export CURRENT_VERSION="$CURRENT_VERSION"
@@ -41,32 +41,28 @@ export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
 export AUTH="${AUTH:-noauth}"
 export SSL="${SSL:-nossl}"
 export PYTHON_BINARY="${PYTHON_BINARY:-}"
-export test_encryption="${test_encryption:-}"
-export test_encryption_pyopenssl="${test_encryption_pyopenssl:-}"
-export test_crypt_shared="${test_crypt_shared:-}"
-export test_pyopenssl="${test_pyopenssl:-}"
 export SETDEFAULTENCODING="${SETDEFAULTENCODING:-}"
-export test_loadbalancer="${test_loadbalancer:-}"
-export test_serverless="${test_serverless:-}"
-export TEST_INDEX_MANAGEMENT="${TEST_INDEX_MANAGEMENT:-}"
 export SKIP_CSOT_TESTS="${SKIP_CSOT_TESTS:-}"
 export MONGODB_STARTED="${MONGODB_STARTED:-}"
 export DISABLE_TEST_COMMANDS="${DISABLE_TEST_COMMANDS:-}"
 export GREEN_FRAMEWORK="${GREEN_FRAMEWORK:-}"
 export NO_EXT="${NO_EXT:-}"
 export COVERAGE="${COVERAGE:-}"
 export COMPRESSORS="${COMPRESSORS:-}"
-export TEST_DATA_LAKE="${TEST_DATA_LAKE:-}"
 export TEST_SUITES="${TEST_SUITES:-}"
 export MONGODB_API_VERSION="${MONGODB_API_VERSION:-}"
 export SKIP_HATCH="${SKIP_HATCH:-}"
 export skip_crypt_shared="${skip_crypt_shared:-}"
-export VERSION="${VERSION:-}"
-export TOPOLOGY="${TOPOLOGY:-}"
 export STORAGE_ENGINE="${STORAGE_ENGINE:-}"
 export ORCHESTRATION_FILE="${ORCHESTRATION_FILE:-}"
 export REQUIRE_API_VERSION="${REQUIRE_API_VERSION:-}"
 export LOAD_BALANCER="${LOAD_BALANCER:-}"
+test_encryption="${test_encryption:-}"
+test_encryption_pyopenssl="${test_encryption_pyopenssl:-}"
+test_crypt_shared="${test_crypt_shared:-}"
+test_pyopenssl="${test_pyopenssl:-}"
+test_loadbalancer="${test_loadbalancer:-}"
+test_serverless="${test_serverless:-}"
 
 export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
 export PATH="$MONGODB_BINARIES:$PATH"

.evergreen/scripts/run-tests.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+TEST_INDEX_MANAGEMENT="${TEST_INDEX_MANAGEMENT:-}"
+TEST_DATA_LAKE="${TEST_DATA_LAKE:-}"
+
 if [ -n "${test_encryption}" ]; then
  ./.evergreen/hatch.sh encryption:setup &
 fi
@@ -45,8 +48,6 @@ if [ -n "${SKIP_CSOT_TESTS}" ]; then
  export SKIP_CSOT_TESTS=1
 fi
 
-python -c "import os; print([(k, v[:3]) for (k, v) in os.environ.items()])"
-
 GREEN_FRAMEWORK=${GREEN_FRAMEWORK} \
  PYTHON_BINARY=${PYTHON_BINARY} \
  NO_EXT=${NO_EXT} \

.evergreen/scripts/run-with-env.sh

@@ -6,7 +6,7 @@
 if [ "${PWD##*/}" == "src" ]; then
  . .evergreen/scripts/env.sh
 else
-  . src/.evergreen/scripts/env.sh
+ . src/.evergreen/scripts/env.sh
 fi
 
 set -eu

.evergreen/scripts/setup-encryption.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 if [ -n "${test_encryption}" ]; then
- ./.evergreen/hatch.sh encryption:setup &
+ ./.evergreen/hatch.sh encryption:setup
 fi