From 9e939529abb336b697b845c05bbf103e6cede8af Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Mon, 26 Oct 2026 16:08:05 -0400 Subject: [PATCH] PYTHON-6191 Remove Python 3.10 VM overrides for Azure KMS and OIDC tests --- .evergreen/scripts/kms_tester.py | 5 ----- .evergreen/scripts/oidc_tester.py | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.evergreen/scripts/kms_tester.py b/.evergreen/scripts/kms_tester.py index 910df26b89..3ea50bbc1b 100644 --- a/.evergreen/scripts/kms_tester.py +++ b/.evergreen/scripts/kms_tester.py @@ -99,11 +99,6 @@ def setup_kms(sub_test_name: str) -> None: create_archive() if sub_test_target == "azure": os.environ["AZUREKMS_VMNAME_PREFIX"] = "PYTHON_DRIVER" - - # Found using "az vm image list --output table" - os.environ["AZUREKMS_IMAGE"] = ( - "Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:latest" - ) else: os.environ["GCPKMS_IMAGEFAMILY"] = "debian-12" diff --git a/.evergreen/scripts/oidc_tester.py b/.evergreen/scripts/oidc_tester.py index b1093f73ec..145ce4dece 100644 --- a/.evergreen/scripts/oidc_tester.py +++ b/.evergreen/scripts/oidc_tester.py @@ -50,10 +50,7 @@ def setup_oidc(sub_test_name: str) -> dict[str, str] | None: if sub_test_name == "azure": env["AZUREOIDC_VMNAME_PREFIX"] = "PYTHON_DRIVER" if "-remote" not in sub_test_name: - if sub_test_name == "azure": - # Found using "az vm image list --output table" - env["AZUREOIDC_IMAGE"] = "Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:latest" - else: + if sub_test_name != "azure": env["GCPKMS_IMAGEFAMILY"] = "debian-12" run_command(f"bash {target_dir}/setup.sh", env=env) if sub_test_name in K8S_NAMES: