update display

Author: blink1073

.evergreen/config.yml

@@ -2827,10 +2827,10 @@ buildvariants:
     - "test-5.0-standalone"
 
 # OCSP test matrix.
-- name: ocsp-test-rhel8-py3.9-v4.0
+- name: ocsp-test-rhel8-v4.0-py3.9
   tasks:
     - name: .ocsp
-  display_name: OCSP test RHEL8 py3.9 v4.0
+  display_name: OCSP test RHEL8 v4.0 py3.9
   run_on:
     - rhel87-small
   batchtime: 20160
@@ -2840,10 +2840,10 @@ buildvariants:
     SSL: ssl
     TOPOLOGY: server
     PYTHON_BINARY: /opt/python/3.9/bin/python3
-- name: ocsp-test-rhel8-py3.10-v4.4
+- name: ocsp-test-rhel8-v4.4-py3.10
   tasks:
     - name: .ocsp
-  display_name: OCSP test RHEL8 py3.10 v4.4
+  display_name: OCSP test RHEL8 v4.4 py3.10
   run_on:
     - rhel87-small
   batchtime: 20160
@@ -2853,10 +2853,10 @@ buildvariants:
     SSL: ssl
     TOPOLOGY: server
     PYTHON_BINARY: /opt/python/3.10/bin/python3
-- name: ocsp-test-rhel8-py3.11-v5.0
+- name: ocsp-test-rhel8-v5.0-py3.11
   tasks:
     - name: .ocsp
-  display_name: OCSP test RHEL8 py3.11 v5.0
+  display_name: OCSP test RHEL8 v5.0 py3.11
   run_on:
     - rhel87-small
   batchtime: 20160
@@ -2866,10 +2866,10 @@ buildvariants:
     SSL: ssl
     TOPOLOGY: server
     PYTHON_BINARY: /opt/python/3.11/bin/python3
-- name: ocsp-test-rhel8-py3.12-v6.0
+- name: ocsp-test-rhel8-v6.0-py3.12
   tasks:
     - name: .ocsp
-  display_name: OCSP test RHEL8 py3.12 v6.0
+  display_name: OCSP test RHEL8 v6.0 py3.12
   run_on:
     - rhel87-small
   batchtime: 20160
@@ -2879,10 +2879,10 @@ buildvariants:
     SSL: ssl
     TOPOLOGY: server
     PYTHON_BINARY: /opt/python/3.12/bin/python3
-- name: ocsp-test-rhel8-py3.13-v7.0
+- name: ocsp-test-rhel8-v7.0-py3.13
   tasks:
     - name: .ocsp
-  display_name: OCSP test RHEL8 py3.13 v7.0
+  display_name: OCSP test RHEL8 v7.0 py3.13
   run_on:
     - rhel87-small
   batchtime: 20160
@@ -2892,10 +2892,10 @@ buildvariants:
     SSL: ssl
     TOPOLOGY: server
     PYTHON_BINARY: /opt/python/3.13/bin/python3
-- name: ocsp-test-rhel8-pypy3.9-v8.0
+- name: ocsp-test-rhel8-v8.0-pypy3.9
   tasks:
     - name: .ocsp
-  display_name: OCSP test RHEL8 pypy3.9 v8.0
+  display_name: OCSP test RHEL8 v8.0 pypy3.9
   run_on:
     - rhel87-small
   batchtime: 20160
@@ -2905,10 +2905,10 @@ buildvariants:
     SSL: ssl
     TOPOLOGY: server
     PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
-- name: ocsp-test-rhel8-pypy3.10-rapid
+- name: ocsp-test-rhel8-rapid-pypy3.10
   tasks:
     - name: .ocsp
-  display_name: OCSP test RHEL8 pypy3.10 rapid
+  display_name: OCSP test RHEL8 rapid pypy3.10
   run_on:
     - rhel87-small
   batchtime: 20160
@@ -2918,10 +2918,10 @@ buildvariants:
     SSL: ssl
     TOPOLOGY: server
     PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
-- name: ocsp-test-rhel8-py3.9-latest
+- name: ocsp-test-rhel8-latest-py3.9
   tasks:
     - name: .ocsp
-  display_name: OCSP test RHEL8 py3.9 latest
+  display_name: OCSP test RHEL8 latest py3.9
   run_on:
     - rhel87-small
   batchtime: 20160
@@ -2931,10 +2931,10 @@ buildvariants:
     SSL: ssl
     TOPOLOGY: server
     PYTHON_BINARY: /opt/python/3.9/bin/python3
-- name: ocsp-test-win64-py3.9-v4.4
+- name: ocsp-test-win64-v4.4-py3.9
   tasks:
     - name: .ocsp-rsa !.ocsp-staple
-  display_name: OCSP test Win64 py3.9 v4.4
+  display_name: OCSP test Win64 v4.4 py3.9
   run_on:
     - windows-64-vsMulti-small
   batchtime: 20160
@@ -2944,10 +2944,10 @@ buildvariants:
     SSL: ssl
     TOPOLOGY: server
     PYTHON_BINARY: C:/python/Python39/python.exe
-- name: ocsp-test-win64-py3.9-v8.0
+- name: ocsp-test-win64-v8.0-py3.9
   tasks:
     - name: .ocsp-rsa !.ocsp-staple
-  display_name: OCSP test Win64 py3.9 v8.0
+  display_name: OCSP test Win64 v8.0 py3.9
   run_on:
     - windows-64-vsMulti-small
   batchtime: 20160
@@ -2957,10 +2957,10 @@ buildvariants:
     SSL: ssl
     TOPOLOGY: server
     PYTHON_BINARY: C:/python/Python39/python.exe
-- name: ocsp-test-macos-py3.9-v4.4
+- name: ocsp-test-macos-v4.4-py3.9
   tasks:
     - name: .ocsp-rsa !.ocsp-staple
-  display_name: OCSP test macOS py3.9 v4.4
+  display_name: OCSP test macOS v4.4 py3.9
   run_on:
     - macos-14
   batchtime: 20160
@@ -2970,10 +2970,10 @@ buildvariants:
     SSL: ssl
     TOPOLOGY: server
     PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
-- name: ocsp-test-macos-py3.9-v8.0
+- name: ocsp-test-macos-v8.0-py3.9
   tasks:
     - name: .ocsp-rsa !.ocsp-staple
-  display_name: OCSP test macOS py3.9 v8.0
+  display_name: OCSP test macOS v8.0 py3.9
   run_on:
     - macos-14
   batchtime: 20160

.evergreen/scripts/generate_config.py

@@ -91,9 +91,9 @@ def get_python_binary(python, host):
     python = ALL_PYTHONS[len(variants) % len(ALL_PYTHONS)]
     host = "rhel8"
     if version in ["rapid", "latest"]:
-        display_name = f"OCSP test RHEL8 {python} {version}"
+        display_name = f"OCSP test RHEL8 {version} {python}"
     else:
-        display_name = f"OCSP test RHEL8 {python} v{version}"
+        display_name = f"OCSP test RHEL8 v{version} {python}"
     variant = create_variant(
         [".ocsp"],
         display_name,
@@ -111,7 +111,7 @@ def get_python_binary(python, host):
     expansions = dict(VERSION=version, AUTH="noauth", SSL="ssl", TOPOLOGY="server")
     batchtime = BATCHTIME_WEEK * 2
     python = CPYTHONS[0]
-    display_name = f"OCSP test {host} {python} v{version}"
+    display_name = f"OCSP test {host} v{version} {python}"
     variant = create_variant(
         task_names,
         display_name,