From b629cb391db6d03260a3acb280fe7ff4831d6dcf Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 22 Sep 2024 12:52:44 -0500 Subject: [PATCH 01/11] fix ensure_python3 --- .evergreen/find-python3.sh | 2 +- .evergreen/install-rust.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/find-python3.sh b/.evergreen/find-python3.sh index bcf56200..0849d98b 100755 --- a/.evergreen/find-python3.sh +++ b/.evergreen/find-python3.sh @@ -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:?}" diff --git a/.evergreen/install-rust.sh b/.evergreen/install-rust.sh index bca79d4d..aee8305d 100755 --- a/.evergreen/install-rust.sh +++ b/.evergreen/install-rust.sh @@ -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 From 68e96baa570b46b4f4011a04ce4df4250abaeb68 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 22 Sep 2024 14:33:06 -0500 Subject: [PATCH 02/11] do not run install-dependencies --- .evergreen/setup.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.evergreen/setup.sh b/.evergreen/setup.sh index b3d20a74..9c53383b 100755 --- a/.evergreen/setup.sh +++ b/.evergreen/setup.sh @@ -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 From 5c1b79be81f5dcdd8123f6ccb2d69201b1044b4a Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 22 Sep 2024 18:29:57 -0500 Subject: [PATCH 03/11] add required api test --- .evergreen/config.yml | 11 +++++++++++ .evergreen/handle-paths.sh | 2 ++ 2 files changed, 13 insertions(+) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index ce621176..5a2a1dd4 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -106,6 +106,7 @@ functions: git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git ${DRIVERS_TOOLS} fi ${DRIVERS_TOOLS}/.evergreen/setup.sh + bash .evergreen/install-dependencies.sh "upload release": - command: s3.put @@ -665,6 +666,16 @@ tasks: TOPOLOGY: "sharded_cluster" - func: "run tests" + - name: "test-8.0-sharded_cluster-required-api" + tags: ["8.0", "sharded_cluster"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + VERSION: "8.0" + TOPOLOGY: "sharded_cluster" + REQUIRE_API_VERSION: "1" + - func: "run tests" + - name: "test-7.0-standalone" tags: ["7.0", "standalone"] commands: diff --git a/.evergreen/handle-paths.sh b/.evergreen/handle-paths.sh index 84bda2bf..479752db 100755 --- a/.evergreen/handle-paths.sh +++ b/.evergreen/handle-paths.sh @@ -10,6 +10,7 @@ set -o errexit # Exit the script with error if any of the commands fail + if [ -z "$SCRIPT_DIR" ]; then echo "Please set $SCRIPT_DIR first" exit 1 @@ -55,6 +56,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 From 8d51c26994bcd39b4429626dcd8062b977477cc1 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 22 Sep 2024 18:31:36 -0500 Subject: [PATCH 04/11] add required api tests --- .evergreen/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 5a2a1dd4..7da4bffd 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1391,6 +1391,7 @@ buildvariants: - name: "test-latest-load_balancer" - name: "test-8.0-replica_set" - name: "test-8.0-sharded_cluster" + - name: "test-8.0-sharded_cluster-required-api" - name: "test-8.0-standalone" - name: "test-7.0-replica_set" - name: "test-7.0-sharded_cluster" @@ -1452,6 +1453,7 @@ buildvariants: - name: "test-latest-replica_set" - name: "test-latest-sharded_cluster" - name: "test-latest-standalone" + - name: "test-8.0-sharded_cluster-required-api" - name: "test-8.0-replica_set" - name: "test-8.0-sharded_cluster" - name: "test-8.0-standalone" From 9690b1f80151d446defe7d37eb4316511f7f8c6d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 22 Sep 2024 18:37:14 -0500 Subject: [PATCH 05/11] fixup --- .evergreen/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 7da4bffd..2a263b6e 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -106,7 +106,7 @@ functions: git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git ${DRIVERS_TOOLS} fi ${DRIVERS_TOOLS}/.evergreen/setup.sh - bash .evergreen/install-dependencies.sh + bash ${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh "upload release": - command: s3.put From ca1c8d49980c10f5a0b48afa763aa7fb0d606085 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 22 Sep 2024 18:43:00 -0500 Subject: [PATCH 06/11] increase timeout --- .evergreen/run-orchestration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/run-orchestration.sh b/.evergreen/run-orchestration.sh index 0212a34c..3e479d81 100755 --- a/.evergreen/run-orchestration.sh +++ b/.evergreen/run-orchestration.sh @@ -173,5 +173,5 @@ EOT # Set the requireApiVersion parameter if [ ! -z "$REQUIRE_API_VERSION" ]; then - $MONGODB_BINARIES/mongosh $URI $MONGO_ORCHESTRATION_HOME/require-api-version.js + $MONGODB_BINARIES/mongosh "$URI/?serverSelectionTimeoutMS=10000" $MONGO_ORCHESTRATION_HOME/require-api-version.js fi From abeae16e5f44ef979be9fe24f3826f72734b5c0d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 22 Sep 2024 18:51:05 -0500 Subject: [PATCH 07/11] try again --- .evergreen/config.yml | 8 ++++---- .evergreen/run-orchestration.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 2a263b6e..a2fc7490 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -666,13 +666,13 @@ tasks: TOPOLOGY: "sharded_cluster" - func: "run tests" - - name: "test-8.0-sharded_cluster-required-api" + - name: "test-8.0-standalone-requirea-api" tags: ["8.0", "sharded_cluster"] commands: - func: "bootstrap mongo-orchestration" vars: VERSION: "8.0" - TOPOLOGY: "sharded_cluster" + TOPOLOGY: "server" REQUIRE_API_VERSION: "1" - func: "run tests" @@ -1391,7 +1391,7 @@ buildvariants: - name: "test-latest-load_balancer" - name: "test-8.0-replica_set" - name: "test-8.0-sharded_cluster" - - name: "test-8.0-sharded_cluster-required-api" + - name: "test-8.0-standalone-require-api" - name: "test-8.0-standalone" - name: "test-7.0-replica_set" - name: "test-7.0-sharded_cluster" @@ -1453,7 +1453,7 @@ buildvariants: - name: "test-latest-replica_set" - name: "test-latest-sharded_cluster" - name: "test-latest-standalone" - - name: "test-8.0-sharded_cluster-required-api" + - name: "test-8.0-sharded_cluster-require-api" - name: "test-8.0-replica_set" - name: "test-8.0-sharded_cluster" - name: "test-8.0-standalone" diff --git a/.evergreen/run-orchestration.sh b/.evergreen/run-orchestration.sh index 3e479d81..0212a34c 100755 --- a/.evergreen/run-orchestration.sh +++ b/.evergreen/run-orchestration.sh @@ -173,5 +173,5 @@ EOT # Set the requireApiVersion parameter if [ ! -z "$REQUIRE_API_VERSION" ]; then - $MONGODB_BINARIES/mongosh "$URI/?serverSelectionTimeoutMS=10000" $MONGO_ORCHESTRATION_HOME/require-api-version.js + $MONGODB_BINARIES/mongosh $URI $MONGO_ORCHESTRATION_HOME/require-api-version.js fi From 9c2e0d2431edd4eac7880ba0a35963560aa6cf62 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 22 Sep 2024 18:52:16 -0500 Subject: [PATCH 08/11] fix name --- .evergreen/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index a2fc7490..557f50e4 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -666,7 +666,7 @@ tasks: TOPOLOGY: "sharded_cluster" - func: "run tests" - - name: "test-8.0-standalone-requirea-api" + - name: "test-8.0-standalone-require-api" tags: ["8.0", "sharded_cluster"] commands: - func: "bootstrap mongo-orchestration" @@ -1453,7 +1453,7 @@ buildvariants: - name: "test-latest-replica_set" - name: "test-latest-sharded_cluster" - name: "test-latest-standalone" - - name: "test-8.0-sharded_cluster-require-api" + - name: "test-8.0-standalone-require-api" - name: "test-8.0-replica_set" - name: "test-8.0-sharded_cluster" - name: "test-8.0-standalone" From a0f71403f6137c69a6218e1f29b8f79bf8d24333 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 22 Sep 2024 20:17:34 -0500 Subject: [PATCH 09/11] try again --- .evergreen/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 557f50e4..98430dc0 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1391,7 +1391,6 @@ buildvariants: - name: "test-latest-load_balancer" - name: "test-8.0-replica_set" - name: "test-8.0-sharded_cluster" - - name: "test-8.0-standalone-require-api" - name: "test-8.0-standalone" - name: "test-7.0-replica_set" - name: "test-7.0-sharded_cluster" @@ -1417,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: "*" } @@ -1453,7 +1454,6 @@ buildvariants: - name: "test-latest-replica_set" - name: "test-latest-sharded_cluster" - name: "test-latest-standalone" - - name: "test-8.0-standalone-require-api" - name: "test-8.0-replica_set" - name: "test-8.0-sharded_cluster" - name: "test-8.0-standalone" From d4953d70f678a14ee10492bee1c37f07b2259f0f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 23 Sep 2024 07:55:05 -0500 Subject: [PATCH 10/11] undo change --- .evergreen/handle-paths.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.evergreen/handle-paths.sh b/.evergreen/handle-paths.sh index 479752db..8fd4e9b9 100755 --- a/.evergreen/handle-paths.sh +++ b/.evergreen/handle-paths.sh @@ -10,7 +10,6 @@ set -o errexit # Exit the script with error if any of the commands fail - if [ -z "$SCRIPT_DIR" ]; then echo "Please set $SCRIPT_DIR first" exit 1 From 8c4827b7061f5513958b39b17c73f0c9ac517bdd Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 23 Sep 2024 10:13:14 -0500 Subject: [PATCH 11/11] Update .evergreen/config.yml Co-authored-by: Ezra Chung <88335979+eramongodb@users.noreply.github.com> --- .evergreen/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 98430dc0..2e249a18 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -106,7 +106,7 @@ functions: git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git ${DRIVERS_TOOLS} fi ${DRIVERS_TOOLS}/.evergreen/setup.sh - bash ${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh + "${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh" "upload release": - command: s3.put