From 6d91859659f830b9804d02dc9c437e81c30fa5d7 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 8 Oct 2025 12:26:16 -0500 Subject: [PATCH] PYTHON-5611 Fix python binary usage for Other Hosts (#2586) --- .evergreen/generated_configs/variants.yml | 6 +----- .evergreen/scripts/generate_config.py | 5 +++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index aae221adf..9bae5f468 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -9,9 +9,9 @@ buildvariants: batchtime: 1440 expansions: VERSION: latest - PYTHON_BINARY: /usr/bin/python3.11 NO_EXT: "1" REQUIRE_FIPS: "1" + PYTHON_BINARY: /usr/bin/python3.11 tags: [] - name: other-hosts-rhel8-zseries-latest tasks: @@ -22,7 +22,6 @@ buildvariants: batchtime: 1440 expansions: VERSION: latest - PYTHON_BINARY: /usr/bin/python3.11 NO_EXT: "1" tags: [] - name: other-hosts-rhel8-power8-latest @@ -34,7 +33,6 @@ buildvariants: batchtime: 1440 expansions: VERSION: latest - PYTHON_BINARY: /usr/bin/python3.11 NO_EXT: "1" tags: [] - name: other-hosts-rhel8-arm64-latest @@ -46,7 +44,6 @@ buildvariants: batchtime: 1440 expansions: VERSION: latest - PYTHON_BINARY: /usr/bin/python3.11 NO_EXT: "1" tags: [] - name: other-hosts-amazon2023-latest @@ -58,7 +55,6 @@ buildvariants: batchtime: 1440 expansions: VERSION: latest - PYTHON_BINARY: /usr/bin/python3.11 NO_EXT: "1" tags: [pr] diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 7f199d148..daec0841d 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -470,13 +470,14 @@ def create_alternative_hosts_variants(): version = "latest" for host_name in OTHER_HOSTS: - # Use explicit Python 3.11 binary on the host since the default python3 is 3.9. - expansions = dict(VERSION="latest", PYTHON_BINARY="/usr/bin/python3.11") + expansions = dict(VERSION="latest") handle_c_ext(C_EXTS[0], expansions) host = HOSTS[host_name] tags = [] if "fips" in host_name.lower(): expansions["REQUIRE_FIPS"] = "1" + # Use explicit Python 3.11 binary on the host since the default python3 is 3.9. + expansions["PYTHON_BINARY"] = "/usr/bin/python3.11" if "amazon" in host_name.lower(): tags.append("pr") variants.append(