Skip to content

Commit 6d91859

Browse files
authored
PYTHON-5611 Fix python binary usage for Other Hosts (#2586)
1 parent 5eb1edf commit 6d91859

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

.evergreen/generated_configs/variants.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ buildvariants:
99
batchtime: 1440
1010
expansions:
1111
VERSION: latest
12-
PYTHON_BINARY: /usr/bin/python3.11
1312
NO_EXT: "1"
1413
REQUIRE_FIPS: "1"
14+
PYTHON_BINARY: /usr/bin/python3.11
1515
tags: []
1616
- name: other-hosts-rhel8-zseries-latest
1717
tasks:
@@ -22,7 +22,6 @@ buildvariants:
2222
batchtime: 1440
2323
expansions:
2424
VERSION: latest
25-
PYTHON_BINARY: /usr/bin/python3.11
2625
NO_EXT: "1"
2726
tags: []
2827
- name: other-hosts-rhel8-power8-latest
@@ -34,7 +33,6 @@ buildvariants:
3433
batchtime: 1440
3534
expansions:
3635
VERSION: latest
37-
PYTHON_BINARY: /usr/bin/python3.11
3836
NO_EXT: "1"
3937
tags: []
4038
- name: other-hosts-rhel8-arm64-latest
@@ -46,7 +44,6 @@ buildvariants:
4644
batchtime: 1440
4745
expansions:
4846
VERSION: latest
49-
PYTHON_BINARY: /usr/bin/python3.11
5047
NO_EXT: "1"
5148
tags: []
5249
- name: other-hosts-amazon2023-latest
@@ -58,7 +55,6 @@ buildvariants:
5855
batchtime: 1440
5956
expansions:
6057
VERSION: latest
61-
PYTHON_BINARY: /usr/bin/python3.11
6258
NO_EXT: "1"
6359
tags: [pr]
6460

.evergreen/scripts/generate_config.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,13 +470,14 @@ def create_alternative_hosts_variants():
470470

471471
version = "latest"
472472
for host_name in OTHER_HOSTS:
473-
# Use explicit Python 3.11 binary on the host since the default python3 is 3.9.
474-
expansions = dict(VERSION="latest", PYTHON_BINARY="/usr/bin/python3.11")
473+
expansions = dict(VERSION="latest")
475474
handle_c_ext(C_EXTS[0], expansions)
476475
host = HOSTS[host_name]
477476
tags = []
478477
if "fips" in host_name.lower():
479478
expansions["REQUIRE_FIPS"] = "1"
479+
# Use explicit Python 3.11 binary on the host since the default python3 is 3.9.
480+
expansions["PYTHON_BINARY"] = "/usr/bin/python3.11"
480481
if "amazon" in host_name.lower():
481482
tags.append("pr")
482483
variants.append(

0 commit comments

Comments
 (0)