Skip to content

Commit 6de3faa

Browse files
blink1073blink1073
committed
cleanup
1 parent 9a52dbf commit 6de3faa

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

‎.evergreen/config.yml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2417,7 +2417,7 @@ buildvariants:
24172417
AUTH: auth
24182418
SSL: ssl
24192419
PYTHON_BINARY: /opt/python/3.9/bin/python3
2420-
- name: test-rhel8-py3.9-auth-ssl
2420+
- name: test-rhel8-py3.9-noauth-nossl
24212421
tasks:
24222422
- name: .4.0
24232423
- name: .4.4
@@ -2427,14 +2427,14 @@ buildvariants:
24272427
- name: .8.0
24282428
- name: .rapid
24292429
- name: .latest
2430-
display_name: Test RHEL8 py3.9 Auth SSL
2430+
display_name: Test RHEL8 py3.9 NoAuth NoSSL
24312431
run_on:
24322432
- rhel87-small
24332433
expansions:
24342434
AUTH: noauth
24352435
SSL: nossl
24362436
PYTHON_BINARY: /opt/python/3.9/bin/python3
2437-
- name: test-rhel8-py3.9-auth-ssl
2437+
- name: test-rhel8-py3.9-auth-nossl
24382438
tasks:
24392439
- name: .4.0
24402440
- name: .4.4
@@ -2444,7 +2444,7 @@ buildvariants:
24442444
- name: .8.0
24452445
- name: .rapid
24462446
- name: .latest
2447-
display_name: Test RHEL8 py3.9 Auth SSL
2447+
display_name: Test RHEL8 py3.9 Auth NoSSL
24482448
run_on:
24492449
- rhel87-small
24502450
expansions:
@@ -2468,7 +2468,7 @@ buildvariants:
24682468
AUTH: auth
24692469
SSL: ssl
24702470
PYTHON_BINARY: /opt/python/3.10/bin/python3
2471-
- name: test-rhel8-py3.10-auth-ssl
2471+
- name: test-rhel8-py3.10-noauth-nossl
24722472
tasks:
24732473
- name: .4.0
24742474
- name: .4.4
@@ -2478,14 +2478,14 @@ buildvariants:
24782478
- name: .8.0
24792479
- name: .rapid
24802480
- name: .latest
2481-
display_name: Test RHEL8 py3.10 Auth SSL
2481+
display_name: Test RHEL8 py3.10 NoAuth NoSSL
24822482
run_on:
24832483
- rhel87-small
24842484
expansions:
24852485
AUTH: noauth
24862486
SSL: nossl
24872487
PYTHON_BINARY: /opt/python/3.10/bin/python3
2488-
- name: test-rhel8-py3.10-auth-ssl
2488+
- name: test-rhel8-py3.10-auth-nossl
24892489
tasks:
24902490
- name: .4.0
24912491
- name: .4.4
@@ -2495,7 +2495,7 @@ buildvariants:
24952495
- name: .8.0
24962496
- name: .rapid
24972497
- name: .latest
2498-
display_name: Test RHEL8 py3.10 Auth SSL
2498+
display_name: Test RHEL8 py3.10 Auth NoSSL
24992499
run_on:
25002500
- rhel87-small
25012501
expansions:
@@ -2519,7 +2519,7 @@ buildvariants:
25192519
AUTH: auth
25202520
SSL: ssl
25212521
PYTHON_BINARY: /opt/python/3.11/bin/python3
2522-
- name: test-rhel8-py3.11-auth-ssl
2522+
- name: test-rhel8-py3.11-noauth-nossl
25232523
tasks:
25242524
- name: .4.0
25252525
- name: .4.4
@@ -2529,14 +2529,14 @@ buildvariants:
25292529
- name: .8.0
25302530
- name: .rapid
25312531
- name: .latest
2532-
display_name: Test RHEL8 py3.11 Auth SSL
2532+
display_name: Test RHEL8 py3.11 NoAuth NoSSL
25332533
run_on:
25342534
- rhel87-small
25352535
expansions:
25362536
AUTH: noauth
25372537
SSL: nossl
25382538
PYTHON_BINARY: /opt/python/3.11/bin/python3
2539-
- name: test-rhel8-py3.11-auth-ssl
2539+
- name: test-rhel8-py3.11-auth-nossl
25402540
tasks:
25412541
- name: .4.0
25422542
- name: .4.4
@@ -2546,7 +2546,7 @@ buildvariants:
25462546
- name: .8.0
25472547
- name: .rapid
25482548
- name: .latest
2549-
display_name: Test RHEL8 py3.11 Auth SSL
2549+
display_name: Test RHEL8 py3.11 Auth NoSSL
25502550
run_on:
25512551
- rhel87-small
25522552
expansions:
@@ -2570,7 +2570,7 @@ buildvariants:
25702570
AUTH: auth
25712571
SSL: ssl
25722572
PYTHON_BINARY: /opt/python/3.12/bin/python3
2573-
- name: test-rhel8-py3.12-auth-ssl
2573+
- name: test-rhel8-py3.12-noauth-nossl
25742574
tasks:
25752575
- name: .4.0
25762576
- name: .4.4
@@ -2580,14 +2580,14 @@ buildvariants:
25802580
- name: .8.0
25812581
- name: .rapid
25822582
- name: .latest
2583-
display_name: Test RHEL8 py3.12 Auth SSL
2583+
display_name: Test RHEL8 py3.12 NoAuth NoSSL
25842584
run_on:
25852585
- rhel87-small
25862586
expansions:
25872587
AUTH: noauth
25882588
SSL: nossl
25892589
PYTHON_BINARY: /opt/python/3.12/bin/python3
2590-
- name: test-rhel8-py3.12-auth-ssl
2590+
- name: test-rhel8-py3.12-auth-nossl
25912591
tasks:
25922592
- name: .4.0
25932593
- name: .4.4
@@ -2597,7 +2597,7 @@ buildvariants:
25972597
- name: .8.0
25982598
- name: .rapid
25992599
- name: .latest
2600-
display_name: Test RHEL8 py3.12 Auth SSL
2600+
display_name: Test RHEL8 py3.12 Auth NoSSL
26012601
run_on:
26022602
- rhel87-small
26032603
expansions:
@@ -2621,7 +2621,7 @@ buildvariants:
26212621
AUTH: auth
26222622
SSL: ssl
26232623
PYTHON_BINARY: /opt/python/3.13/bin/python3
2624-
- name: test-rhel8-py3.13-auth-ssl
2624+
- name: test-rhel8-py3.13-noauth-nossl
26252625
tasks:
26262626
- name: .4.0
26272627
- name: .4.4
@@ -2631,14 +2631,14 @@ buildvariants:
26312631
- name: .8.0
26322632
- name: .rapid
26332633
- name: .latest
2634-
display_name: Test RHEL8 py3.13 Auth SSL
2634+
display_name: Test RHEL8 py3.13 NoAuth NoSSL
26352635
run_on:
26362636
- rhel87-small
26372637
expansions:
26382638
AUTH: noauth
26392639
SSL: nossl
26402640
PYTHON_BINARY: /opt/python/3.13/bin/python3
2641-
- name: test-rhel8-py3.13-auth-ssl
2641+
- name: test-rhel8-py3.13-auth-nossl
26422642
tasks:
26432643
- name: .4.0
26442644
- name: .4.4
@@ -2648,7 +2648,7 @@ buildvariants:
26482648
- name: .8.0
26492649
- name: .rapid
26502650
- name: .latest
2651-
display_name: Test RHEL8 py3.13 Auth SSL
2651+
display_name: Test RHEL8 py3.13 Auth NoSSL
26522652
run_on:
26532653
- rhel87-small
26542654
expansions:
@@ -2672,7 +2672,7 @@ buildvariants:
26722672
AUTH: auth
26732673
SSL: ssl
26742674
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
2675-
- name: test-rhel8-pypy3.9-auth-ssl
2675+
- name: test-rhel8-pypy3.9-noauth-nossl
26762676
tasks:
26772677
- name: .4.0
26782678
- name: .4.4
@@ -2682,14 +2682,14 @@ buildvariants:
26822682
- name: .8.0
26832683
- name: .rapid
26842684
- name: .latest
2685-
display_name: Test RHEL8 pypy3.9 Auth SSL
2685+
display_name: Test RHEL8 pypy3.9 NoAuth NoSSL
26862686
run_on:
26872687
- rhel87-small
26882688
expansions:
26892689
AUTH: noauth
26902690
SSL: nossl
26912691
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
2692-
- name: test-rhel8-pypy3.9-auth-ssl
2692+
- name: test-rhel8-pypy3.9-auth-nossl
26932693
tasks:
26942694
- name: .4.0
26952695
- name: .4.4
@@ -2699,7 +2699,7 @@ buildvariants:
26992699
- name: .8.0
27002700
- name: .rapid
27012701
- name: .latest
2702-
display_name: Test RHEL8 pypy3.9 Auth SSL
2702+
display_name: Test RHEL8 pypy3.9 Auth NoSSL
27032703
run_on:
27042704
- rhel87-small
27052705
expansions:
@@ -2723,7 +2723,7 @@ buildvariants:
27232723
AUTH: auth
27242724
SSL: ssl
27252725
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
2726-
- name: test-rhel8-pypy3.10-auth-ssl
2726+
- name: test-rhel8-pypy3.10-noauth-nossl
27272727
tasks:
27282728
- name: .4.0
27292729
- name: .4.4
@@ -2733,14 +2733,14 @@ buildvariants:
27332733
- name: .8.0
27342734
- name: .rapid
27352735
- name: .latest
2736-
display_name: Test RHEL8 pypy3.10 Auth SSL
2736+
display_name: Test RHEL8 pypy3.10 NoAuth NoSSL
27372737
run_on:
27382738
- rhel87-small
27392739
expansions:
27402740
AUTH: noauth
27412741
SSL: nossl
27422742
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
2743-
- name: test-rhel8-pypy3.10-auth-ssl
2743+
- name: test-rhel8-pypy3.10-auth-nossl
27442744
tasks:
27452745
- name: .4.0
27462746
- name: .4.4
@@ -2750,7 +2750,7 @@ buildvariants:
27502750
- name: .8.0
27512751
- name: .rapid
27522752
- name: .latest
2753-
display_name: Test RHEL8 pypy3.10 Auth SSL
2753+
display_name: Test RHEL8 pypy3.10 Auth NoSSL
27542754
run_on:
27552755
- rhel87-small
27562756
expansions:
@@ -2945,7 +2945,7 @@ buildvariants:
29452945
- name: .latest .sharded_cluster
29462946
display_name: Test macOS (arm) py3.9 Auth SSL
29472947
run_on:
2948-
- macos-14-arm65
2948+
- macos-14-arm64
29492949
expansions:
29502950
AUTH: auth
29512951
ssl: ssl
@@ -2962,7 +2962,7 @@ buildvariants:
29622962
- name: .latest .sharded_cluster
29632963
display_name: Test macOS (arm) py3.10 Auth SSL
29642964
run_on:
2965-
- macos-14-arm65
2965+
- macos-14-arm64
29662966
expansions:
29672967
AUTH: auth
29682968
ssl: ssl
@@ -2979,7 +2979,7 @@ buildvariants:
29792979
- name: .latest .sharded_cluster
29802980
display_name: Test macOS (arm) py3.11 Auth SSL
29812981
run_on:
2982-
- macos-14-arm65
2982+
- macos-14-arm64
29832983
expansions:
29842984
AUTH: auth
29852985
ssl: ssl
@@ -2996,7 +2996,7 @@ buildvariants:
29962996
- name: .latest .sharded_cluster
29972997
display_name: Test macOS (arm) py3.12 Auth SSL
29982998
run_on:
2999-
- macos-14-arm65
2999+
- macos-14-arm64
30003000
expansions:
30013001
AUTH: auth
30023002
ssl: ssl
@@ -3013,7 +3013,7 @@ buildvariants:
30133013
- name: .latest .sharded_cluster
30143014
display_name: Test macOS (arm) py3.13 Auth SSL
30153015
run_on:
3016-
- macos-14-arm65
3016+
- macos-14-arm64
30173017
expansions:
30183018
AUTH: auth
30193019
ssl: ssl

‎.evergreen/scripts/generate_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Host:
4141
HOSTS["rhel8"] = Host("rhel8", "rhel87-small", "RHEL8")
4242
HOSTS["win64"] = Host("win64", "windows-64-vsMulti-small", "Win64")
4343
HOSTS["macos"] = Host("macos", "macos-14", "macOS")
44-
HOSTS["macos-arm64"] = Host("macos-arm64", "macos-14-arm65", "macOS (arm)")
44+
HOSTS["macos-arm64"] = Host("macos-arm64", "macos-14-arm64", "macOS (arm)")
4545

4646

4747
##############
@@ -116,7 +116,7 @@ def get_display_name(base: str, host: str, **kwargs) -> str:
116116
else:
117117
name = f"py{value}"
118118
elif key in DISPLAY_LOOKUP:
119-
name = DISPLAY_LOOKUP[key]
119+
name = DISPLAY_LOOKUP[value]
120120
else:
121121
raise ValueError(f"Missing display handling for {key}")
122122
display_name = f"{display_name} {name}"

0 commit comments

Comments
 (0)