Skip to content

Commit ce775f3

Browse files
committed
Use just on host
1 parent 3651496 commit ce775f3

18 files changed

+37
-23
lines changed

.evergreen/install-dependencies.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,18 @@ else
1313
SUDO="sudo"
1414
fi
1515

16+
# Install just.
17+
if [ ! -f $HOME/.local/bin/just ]; then
18+
curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to "$HOME/.local/bin" || {
19+
# CARGO_HOME is defined in configure-env.sh
20+
export CARGO_HOME=${CARGO_HOME:-$HOME/.cargo/}
21+
export RUSTUP_HOME="${CARGO_HOME}/.rustup"
22+
${DRIVERS_TOOLS}/.evergreen/install-rust.sh
23+
cargo install just
24+
mv $CARGO_HOME/just $HOME/.local/bin
25+
}
26+
fi
27+
1628
# Add 'server' and 'hostname_not_in_cert' as a hostnames
1729
echo "127.0.0.1 server" | $SUDO tee -a /etc/hosts
1830
echo "127.0.0.1 hostname_not_in_cert" | $SUDO tee -a /etc/hosts

.evergreen/hatch.sh renamed to .evergreen/just.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
set -eu
33

44
. .evergreen/scripts/setup-dev-env.sh
5-
hatch run "$@"
5+
just "$@"

.evergreen/run-azurekms-fail-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ PYTHON_BINARY=/opt/mongodbtoolchain/v4/bin/python3 \
88
KEY_NAME="${AZUREKMS_KEYNAME}" \
99
KEY_VAULT_ENDPOINT="${AZUREKMS_KEYVAULTENDPOINT}" \
1010
SUCCESS=false TEST_FLE_AZURE_AUTO=1 \
11-
$HERE/hatch.sh test:test-eg
11+
$HERE/just.sh test-eg
1212
bash $HERE/teardown-encryption.sh

.evergreen/run-azurekms-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ AZUREKMS_CMD="tar xf mongo-python-driver.tgz" \
1818
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
1919
echo "Untarring file ... end"
2020
echo "Running test ... begin"
21-
AZUREKMS_CMD="KEY_NAME=\"$AZUREKMS_KEYNAME\" KEY_VAULT_ENDPOINT=\"$AZUREKMS_KEYVAULTENDPOINT\" SUCCESS=true TEST_FLE_AZURE_AUTO=1 ./.evergreen/hatch.sh test:test-eg" \
21+
AZUREKMS_CMD="KEY_NAME=\"$AZUREKMS_KEYNAME\" KEY_VAULT_ENDPOINT=\"$AZUREKMS_KEYVAULTENDPOINT\" SUCCESS=true TEST_FLE_AZURE_AUTO=1 ./.evergreen/just.sh test-eg" \
2222
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
2323
echo "Running test ... end"
2424
bash $HERE/teardown-encryption.sh

.evergreen/run-gcpkms-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ echo "Untarring file ... begin"
1717
GCPKMS_CMD="tar xf mongo-python-driver.tgz" $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh
1818
echo "Untarring file ... end"
1919
echo "Running test ... begin"
20-
GCPKMS_CMD="SUCCESS=true TEST_FLE_GCP_AUTO=1 ./.evergreen/hatch.sh test:test-eg" $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh
20+
GCPKMS_CMD="SUCCESS=true TEST_FLE_GCP_AUTO=1 ./.evergreen/just.sh test-eg" $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh
2121
echo "Running test ... end"
2222
bash $HERE/teardown-encryption.sh

.evergreen/run-mongodb-aws-ecs-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ export AUTH="auth"
3131
export SET_XTRACE_ON=1
3232
cd src
3333
rm -rf .venv
34-
bash .evergreen/hatch.sh test:test-eg
34+
bash .evergreen/just.sh test-eg

.evergreen/run-mongodb-oidc-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ fi
3232
export TEST_AUTH_OIDC=1
3333
export COVERAGE=1
3434
export AUTH="auth"
35-
bash ./.evergreen/hatch.sh test:test-eg -- "${@:1}"
35+
bash ./.evergreen/just.sh test-eg "${@:1}"

.evergreen/run-perf-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ export OUTPUT_FILE="${PROJECT_DIRECTORY}/results.json"
1616
export PYTHON_BINARY=/opt/mongodbtoolchain/v4/bin/python3
1717
export PERF_TEST=1
1818

19-
bash ./.evergreen/hatch.sh test:test-eg
19+
bash ./.evergreen/just.sh test-eg

.evergreen/scripts/run-atlas-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
set +x
55
set -o errexit
66
bash "${DRIVERS_TOOLS}"/.evergreen/auth_aws/setup_secrets.sh drivers/atlas_connect
7-
TEST_ATLAS=1 bash "${PROJECT_DIRECTORY}"/.evergreen/hatch.sh test:test-eg
7+
TEST_ATLAS=1 bash "${PROJECT_DIRECTORY}"/.evergreen/just.sh test-eg

.evergreen/scripts/run-doctests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22

33
set -o xtrace
4-
PYTHON_BINARY=${PYTHON_BINARY} bash "${PROJECT_DIRECTORY}"/.evergreen/hatch.sh doctest:test
4+
PYTHON_BINARY=${PYTHON_BINARY} bash "${PROJECT_DIRECTORY}"/.evergreen/just.sh docs-test

0 commit comments

Comments
 (0)