Skip to content

Commit 9add937

Browse files
committed
fix hatch handling
1 parent d618bdc commit 9add937

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.evergreen/scripts/configure-env.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ fi
1111

1212
PROJECT_DIRECTORY="$(pwd)"
1313
DRIVERS_TOOLS="$(dirname $PROJECT_DIRECTORY)/drivers-tools"
14+
CARGO_HOME=${CARGO_HOME:-${DRIVERS_TOOLS}/.cargo}
1415

1516
# Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
1617
if [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin
1718
DRIVERS_TOOLS=$(cygpath -m $DRIVERS_TOOLS)
1819
PROJECT_DIRECTORY=$(cygpath -m $PROJECT_DIRECTORY)
20+
CARGO_HOME=$(cygpath -m $CARGO_HOME)
1921
fi
2022

2123
SCRIPT_DIR="$PROJECT_DIRECTORY/.evergreen/scripts"
@@ -53,6 +55,7 @@ export REQUIRE_API_VERSION="${REQUIRE_API_VERSION:-}"
5355
export skip_web_identity_auth_test="${skip_web_identity_auth_test:-}"
5456
export skip_ECS_auth_test="${skip_ECS_auth_test:-}"
5557
58+
export CARGO_HOME="$CARGO_HOME"
5659
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
5760
export PATH="$MONGODB_BINARIES:$PATH"
5861
# shellcheck disable=SC2154

.evergreen/scripts/run-enterprise-auth-tests.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
# Disable xtrace for security reasons (just in case it was accidentally set).
44
set +x
5-
bash "${DRIVERS_TOOLS}"/.evergreen/auth_aws/setup_secrets.sh drivers/enterprise_auth
5+
# Use the default python to bootstrap secrets.
6+
PYTHON_BINARY="" bash "${DRIVERS_TOOLS}"/.evergreen/auth_aws/setup_secrets.sh drivers/enterprise_auth
67
TEST_ENTERPRISE_AUTH=1 AUTH=auth bash "${PROJECT_DIRECTORY}"/.evergreen/hatch.sh test:test-eg

0 commit comments

Comments
 (0)