Skip to content

Commit a3c27ef

Browse files
committed
Add pymongo clone dir for just setup-tests
1 parent f99558c commit a3c27ef

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

.evergreen/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ functions:
5555
params:
5656
binary: bash
5757
working_dir: "src"
58-
include_expansions_in_env: ["DRIVERS_TOOLS", "MONGODB_URI", "DJANGO_SETTINGS_MODULE", "CRYPT_SHARED_LIB_PATH"]
58+
include_expansions_in_env: ["DRIVERS_TOOLS", "PYMONGO_DIR", "MONGODB_URI", "DJANGO_SETTINGS_MODULE", "CRYPT_SHARED_LIB_PATH"]
5959
args:
6060
- ./.evergreen/run-tests.sh
6161

@@ -126,8 +126,8 @@ buildvariants:
126126
- name: run-tests
127127

128128
- name: tests-8-qe
129-
display_name: Run Tests 8.0 QE
130-
run_on: rhel94-perf-atlas
129+
display_name: Run Tests 8.2 QE
130+
run_on: rhel87-small
131131
expansions:
132132
MONGODB_VERSION: "8.2"
133133
TOPOLOGY: replica_set

.evergreen/setup.sh

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ fi
1414
# Python has cygwin path problems on Windows.
1515
DRIVERS_TOOLS="$(dirname "$(pwd)")/drivers-tools"
1616
PROJECT_DIRECTORY="$(pwd)"
17+
PYMONGO_DIR="$(dirname "$DRIVERS_TOOLS")/pymongo"
1718

1819
if [ "Windows_NT" = "${OS:-}" ]; then
19-
DRIVERS_TOOLS=$(cygpath -m $DRIVERS_TOOLS)
20-
PROJECT_DIRECTORY=$(cygpath -m $PROJECT_DIRECTORY)
20+
DRIVERS_TOOLS=$(cygpath -m "$DRIVERS_TOOLS")
21+
PROJECT_DIRECTORY=$(cygpath -m "$PROJECT_DIRECTORY")
22+
PYMONGO_DIR=$(cygpath -m "$PYMONGO_DIR")
2123
fi
2224
export PROJECT_DIRECTORY
2325
export DRIVERS_TOOLS
26+
export PYMONGO_DIR
2427

2528
export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
2629
export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
@@ -34,15 +37,20 @@ MONGO_ORCHESTRATION_HOME: "$MONGO_ORCHESTRATION_HOME"
3437
MONGODB_BINARIES: "$MONGODB_BINARIES"
3538
UPLOAD_BUCKET: "$UPLOAD_BUCKET"
3639
PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
40+
PYMONGO_DIR: "$PYMONGO_DIR"
3741
EOT
3842

3943
# Set up drivers-tools with a .env file.
40-
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git ${DRIVERS_TOOLS}
41-
cat <<EOT > ${DRIVERS_TOOLS}/.env
44+
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git "${DRIVERS_TOOLS}"
45+
cat <<EOT > "${DRIVERS_TOOLS}/.env"
4246
CURRENT_VERSION="$CURRENT_VERSION"
4347
DRIVERS_TOOLS="$DRIVERS_TOOLS"
4448
MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
4549
MONGODB_BINARIES="$MONGODB_BINARIES"
4650
UPLOAD_BUCKET="$UPLOAD_BUCKET"
4751
PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
52+
PYMONGO_DIR="$PYMONGO_DIR"
4853
EOT
54+
55+
# Clone the pymongo driver repository alongside drivers-tools for use in tests.
56+
git clone https://github.com/mongodb/mongo-python-driver.git "$PYMONGO_DIR"

0 commit comments

Comments
 (0)