Skip to content

Commit

Permalink
More Usability Improvements (#501)
Browse files Browse the repository at this point in the history
Co-authored-by: Ezra Chung <88335979+eramongodb@users.noreply.github.com>
  • Loading branch information
blink1073 and eramongodb authored Sep 23, 2024
1 parent 8e4f0db commit b26f427
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 9 deletions.
17 changes: 15 additions & 2 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ functions:
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git ${DRIVERS_TOOLS}
fi
${DRIVERS_TOOLS}/.evergreen/setup.sh
"${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh"
"upload release":
- command: s3.put
Expand Down Expand Up @@ -665,6 +666,16 @@ tasks:
TOPOLOGY: "sharded_cluster"
- func: "run tests"

- name: "test-8.0-standalone-require-api"
tags: ["8.0", "sharded_cluster"]
commands:
- func: "bootstrap mongo-orchestration"
vars:
VERSION: "8.0"
TOPOLOGY: "server"
REQUIRE_API_VERSION: "1"
- func: "run tests"

- name: "test-7.0-standalone"
tags: ["7.0", "standalone"]
commands:
Expand Down Expand Up @@ -1405,10 +1416,12 @@ buildvariants:
rules:
- if:
auth: "auth"
ssl: "ssl"
ssl: "nossl"
os-fully-featured: "*"
then:
add_tasks: ["test-install-binaries"]
add_tasks:
- "test-install-binaries"
- "test-8.0-standalone-require-api"

- matrix_name: "tests-os-requires-50"
matrix_spec: {"os-requires-50": "*", auth: "*", ssl: "*" }
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/find-python3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ ensure_python3() {
python_binary="$(find_python3 2>/dev/null)" || return
echo "Finding Python3 binary... done."
else
echo "Using Python binary $PYTHON"
echo "Using Python binary $python_binary"
fi
} 1>&2
echo "${python_binary:?}"
Expand Down
1 change: 1 addition & 0 deletions .evergreen/handle-paths.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ set -a

MONGODB_BINARIES=${MONGODB_BINARIES:-${DRIVERS_TOOLS}/mongodb/bin}
MONGO_ORCHESTRATION_HOME=${MONGO_ORCHESTRATION_HOME:-${DRIVERS_TOOLS}/.evergreen/orchestration}
PATH="${MONGO_ORCHESTRATION_HOME}:$PATH"

# Add the local .bin dir to the path.
case "$PATH" in
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/install-rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pushd $SCRIPT_DIR

export RUSTUP_HOME="${RUSTUP_HOME:-"${DRIVERS_TOOLS}/.rustup"}"
export CARGO_HOME="${CARGO_HOME:-"${DRIVERS_TOOLS}/.cargo"}"
export PATH="${RUSTUP_HOME}/bin:${CARGO_HOME}/bin:$PATH"
export PATH="${CARGO_HOME}/bin:$PATH"

# Make sure to use msvc toolchain rather than gnu, which is the default for cygwin
if [ "Windows_NT" == "${OS:-}" ]; then
Expand Down
5 changes: 0 additions & 5 deletions .evergreen/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ echo '{"results": [{ "status": "FAIL", "test_file": "Build", "log_raw": "No test
# Create a stub mongo-orchestration results file.
echo '{"results": [{ "status": "PASS", "test_file": "Build", "log_raw": "Stub file for mongo-orchestration results" } ]}' > ${DRIVERS_TOOLS}/results.json

# Install project dependencies.
if [[ -f "$PROJECT_DIRECTORY/.evergreen/install-dependencies.sh" ]]; then
bash "$PROJECT_DIRECTORY/.evergreen/install-dependencies.sh"
fi

# Ensure there is at least one log file.
cat << EOF > ${DRIVERS_TOOLS}/.evergreen/inputs.log
PROJECT_DIRECTORY=$PROJECT_DIRECTORY
Expand Down

0 comments on commit b26f427

Please sign in to comment.