Skip to content

Commit d2d8f6e

Browse files
authored
PYTHON-5019 Fix mod_wsgi tests (mongodb#2039)
1 parent 71ef4e0 commit d2d8f6e

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.evergreen/install-dependencies.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ cp ${PROJECT_DIRECTORY}/test/certificates/* ${DRIVERS_TOOLS}/.evergreen/x509gen/
77
# Replace MongoOrchestration's client certificate.
88
cp ${PROJECT_DIRECTORY}/test/certificates/client.pem ${MONGO_ORCHESTRATION_HOME}/lib/client.pem
99

10-
# Ensure hatch is installed.
11-
bash ${PROJECT_DIRECTORY}/.evergreen/scripts/ensure-hatch.sh
12-
1310
if [ -w /etc/hosts ]; then
1411
SUDO=""
1512
else

.evergreen/scripts/ensure-hatch.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
set -eu
44

5+
HERE=$(dirname ${BASH_SOURCE:-$0})
6+
pushd "$(dirname "$(dirname $HERE)")" > /dev/null
7+
58
# Ensure hatch is available.
69
if [ ! -x "$(command -v hatch)" ]; then
710
# Install a virtual env with "hatch"
@@ -53,3 +56,4 @@ if [ ! -x "$(command -v hatch)" ]; then
5356
echo "Installing hatch... done."
5457
fi
5558
hatch --version
59+
popd > /dev/null

.evergreen/setup-spawn-host.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ if [ -z "$1" ]
88
fi
99

1010
target=$1
11+
remote_dir=/home/ec2-user/mongo-python-driver
1112

1213
echo "Copying files to $target..."
13-
rsync -az -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/ec2-user/mongo-python-driver
14+
rsync -az -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:$remote_dir
1415
echo "Copying files to $target... done"
1516

16-
ssh $target /home/ec2-user/mongo-python-driver/.evergreen/scripts/setup-system.sh
17+
ssh $target $remote_dir/.evergreen/scripts/setup-system.sh
18+
ssh $target "PYTHON_BINARY=${PYTHON_BINARY:-} $remote_dir/.evergreen/scripts/ensure-hatch.sh"

0 commit comments

Comments
 (0)