From 5f4467f28a7a7cbf182a854c6ebc31a89e4ba5e9 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 18 Aug 2025 17:36:39 -0500 Subject: [PATCH 1/2] fix c extension building on azure and gcp vms --- .evergreen/run-mongodb-oidc-test.sh | 2 ++ .evergreen/scripts/kms_tester.py | 10 ++++++++-- .evergreen/scripts/oidc_tester.py | 9 ++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.evergreen/run-mongodb-oidc-test.sh b/.evergreen/run-mongodb-oidc-test.sh index a60b112bcb..1a1cd81a8b 100755 --- a/.evergreen/run-mongodb-oidc-test.sh +++ b/.evergreen/run-mongodb-oidc-test.sh @@ -8,7 +8,9 @@ if [ ${OIDC_ENV} == "k8s" ]; then SUB_TEST_NAME=$K8S_VARIANT-remote else SUB_TEST_NAME=$OIDC_ENV-remote + apt-get install -y python3-dev build-essential fi + bash ./.evergreen/just.sh setup-tests auth_oidc $SUB_TEST_NAME bash ./.evergreen/just.sh run-tests "${@:1}" diff --git a/.evergreen/scripts/kms_tester.py b/.evergreen/scripts/kms_tester.py index f0438e4eef..36530425af 100644 --- a/.evergreen/scripts/kms_tester.py +++ b/.evergreen/scripts/kms_tester.py @@ -30,7 +30,10 @@ def _setup_azure_vm(base_env: dict[str, str]) -> None: env["AZUREKMS_CMD"] = "tar xf mongo-python-driver.tgz" run_command(f"{azure_dir}/run-command.sh", env=env) - env["AZUREKMS_CMD"] = "NO_EXT=1 bash .evergreen/just.sh setup-tests kms azure-remote" + env["AZUREKMS_CMD"] = "apt-get install -y python3-dev build-essential" + run_command(f"{azure_dir}/run-command.sh", env=env) + + env["AZUREKMS_CMD"] = "bash .evergreen/just.sh setup-tests kms azure-remote" run_command(f"{azure_dir}/run-command.sh", env=env) LOGGER.info("Setting up Azure VM... done.") @@ -47,7 +50,10 @@ def _setup_gcp_vm(base_env: dict[str, str]) -> None: env["GCPKMS_CMD"] = "tar xf mongo-python-driver.tgz" run_command(f"{gcp_dir}/run-command.sh", env=env) - env["GCPKMS_CMD"] = "NO_EXT=1 bash ./.evergreen/just.sh setup-tests kms gcp-remote" + env["GCPKMS_CMD"] = "apt-get install -y python3-dev build-essential" + run_command(f"{gcp_dir}/run-command.sh", env=env) + + env["GCPKMS_CMD"] = "bash ./.evergreen/just.sh setup-tests kms gcp-remote" run_command(f"{gcp_dir}/run-command.sh", env=env) LOGGER.info("Setting up GCP VM...") diff --git a/.evergreen/scripts/oidc_tester.py b/.evergreen/scripts/oidc_tester.py index fd702cf1d1..d6f127bbd6 100644 --- a/.evergreen/scripts/oidc_tester.py +++ b/.evergreen/scripts/oidc_tester.py @@ -2,7 +2,14 @@ import os -from utils import DRIVERS_TOOLS, TMP_DRIVER_FILE, create_archive, read_env, run_command, write_env +from utils import ( + DRIVERS_TOOLS, + TMP_DRIVER_FILE, + create_archive, + read_env, + run_command, + write_env, +) K8S_NAMES = ["aks", "gke", "eks"] K8S_REMOTE_NAMES = [f"{n}-remote" for n in K8S_NAMES] From 37975cb7f951f1daf231906b9d255dddbaed86ec Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 18 Aug 2025 18:54:39 -0500 Subject: [PATCH 2/2] update kms code --- .evergreen/scripts/kms_tester.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/scripts/kms_tester.py b/.evergreen/scripts/kms_tester.py index 36530425af..3579e77619 100644 --- a/.evergreen/scripts/kms_tester.py +++ b/.evergreen/scripts/kms_tester.py @@ -30,7 +30,7 @@ def _setup_azure_vm(base_env: dict[str, str]) -> None: env["AZUREKMS_CMD"] = "tar xf mongo-python-driver.tgz" run_command(f"{azure_dir}/run-command.sh", env=env) - env["AZUREKMS_CMD"] = "apt-get install -y python3-dev build-essential" + env["AZUREKMS_CMD"] = "sudo apt-get install -y python3-dev build-essential" run_command(f"{azure_dir}/run-command.sh", env=env) env["AZUREKMS_CMD"] = "bash .evergreen/just.sh setup-tests kms azure-remote" @@ -50,7 +50,7 @@ def _setup_gcp_vm(base_env: dict[str, str]) -> None: env["GCPKMS_CMD"] = "tar xf mongo-python-driver.tgz" run_command(f"{gcp_dir}/run-command.sh", env=env) - env["GCPKMS_CMD"] = "apt-get install -y python3-dev build-essential" + env["GCPKMS_CMD"] = "sudo apt-get install -y python3-dev build-essential" run_command(f"{gcp_dir}/run-command.sh", env=env) env["GCPKMS_CMD"] = "bash ./.evergreen/just.sh setup-tests kms gcp-remote"