From 37ca30f6204286ace6e0dbeef50ffe4a196be0c7 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 15 Sep 2024 13:14:35 -0500 Subject: [PATCH 1/6] Update to use current supported hosts --- .evergreen/config.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index a9dc669718..f62a1ea3e3 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -2083,8 +2083,8 @@ axes: display_name: "RHEL 8.x" run_on: rhel87-small batchtime: 10080 # 7 days - - id: rhel92-fips - display_name: "RHEL 9.2 FIPS" + - id: rhel9-fips + display_name: "RHEL 9 FIPS" run_on: rhel92-fips batchtime: 10080 # 7 days - id: ubuntu-22.04 @@ -2095,26 +2095,26 @@ axes: display_name: "Ubuntu 20.04" run_on: ubuntu2004-small batchtime: 10080 # 7 days - - id: rhel83-zseries - display_name: "RHEL 8.3 (zSeries)" - run_on: rhel83-zseries-small + - id: rhel8-zseries + display_name: "RHEL 8 (zSeries)" + run_on: rhel8-zseries-small batchtime: 10080 # 7 days variables: SKIP_HATCH: true - - id: rhel81-power8 - display_name: "RHEL 8.1 (POWER8)" - run_on: rhel81-power8-small + - id: rhel8-power8 + display_name: "RHEL 8 (POWER8)" + run_on: rhel8-power-small batchtime: 10080 # 7 days variables: SKIP_HATCH: true - id: rhel82-arm64 - display_name: "RHEL 8.2 (ARM64)" + display_name: "RHEL 8 (ARM64)" run_on: rhel82-arm64-small batchtime: 10080 # 7 days variables: - - id: windows-64-vsMulti-small + - id: windows-2022-small display_name: "Windows 64" - run_on: windows-64-vsMulti-small + run_on: windows-2022-small batchtime: 10080 # 7 days variables: skip_ECS_auth_test: true @@ -2606,7 +2606,7 @@ buildvariants: - matrix_name: "tests-pyopenssl-windows" matrix_spec: - platform: windows-64-vsMulti-small + platform: windows python-version-windows: "*" auth: "auth" ssl: "ssl" @@ -2698,7 +2698,7 @@ buildvariants: - matrix_name: "tests-windows-python-version" matrix_spec: - platform: windows-64-vsMulti-small + platform: windows python-version-windows: "*" auth-ssl: "*" display_name: "${platform} ${python-version-windows} ${auth-ssl}" @@ -2706,7 +2706,7 @@ buildvariants: - matrix_name: "tests-windows-python-version-32-bit" matrix_spec: - platform: windows-64-vsMulti-small + platform: windows python-version-windows-32: "*" auth-ssl: "*" display_name: "${platform} ${python-version-windows-32} ${auth-ssl}" From 02e5022f4333d0f44a304138b373ee7e60cdf2f0 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 15 Sep 2024 13:16:54 -0500 Subject: [PATCH 2/6] fix platform names --- .evergreen/config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index f62a1ea3e3..4efe24fd29 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -2112,7 +2112,7 @@ axes: run_on: rhel82-arm64-small batchtime: 10080 # 7 days variables: - - id: windows-2022-small + - id: window display_name: "Windows 64" run_on: windows-2022-small batchtime: 10080 # 7 days @@ -2470,7 +2470,7 @@ buildvariants: - matrix_name: "tests-fips" matrix_spec: platform: - - rhel92-fips + - rhel9-fips auth: "auth" ssl: "ssl" display_name: "${platform} ${auth} ${ssl}" @@ -2547,9 +2547,9 @@ buildvariants: - matrix_name: "test-different-cpu-architectures" matrix_spec: platform: - - rhel83-zseries # Added in 5.0.8 (SERVER-44074) - - rhel81-power8 # Added in 4.2.7 (SERVER-44072) - - rhel82-arm64 # Added in 4.4.2 (SERVER-48282) + - rhel8-zseries # Added in 5.0.8 (SERVER-44074) + - rhel8-power8 # Added in 4.2.7 (SERVER-44072) + - rhel8-arm64 # Added in 4.4.2 (SERVER-48282) auth-ssl: "*" display_name: "${platform} ${auth-ssl}" tasks: @@ -2724,7 +2724,7 @@ buildvariants: - matrix_name: "tests-windows-encryption" matrix_spec: - platform: windows-64-vsMulti-small + platform: windows python-version-windows: "*" auth-ssl: "*" encryption: "*" @@ -2733,7 +2733,7 @@ buildvariants: rules: - if: encryption: ["encryption", "encryption_crypt_shared"] - platform: windows-64-vsMulti-small + platform: windows python-version-windows: "*" auth-ssl: "*" then: @@ -2795,7 +2795,7 @@ buildvariants: - matrix_name: "tests-windows-enterprise-auth" matrix_spec: - platform: windows-64-vsMulti-small + platform: windows python-version-windows: "*" auth: "auth" display_name: "Enterprise ${auth} ${platform} ${python-version-windows}" @@ -2907,7 +2907,7 @@ buildvariants: - matrix_name: "ocsp-test-windows" matrix_spec: - platform: windows-64-vsMulti-small + platform: windows python-version-windows: ["3.8", "3.10"] mongodb-version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"] auth: "noauth" @@ -2932,7 +2932,7 @@ buildvariants: - matrix_name: "oidc-auth-test" matrix_spec: - platform: [ rhel8, macos, windows-64-vsMulti-small ] + platform: [ rhel8, macos, windows ] display_name: "OIDC Auth ${platform}" tasks: - name: testoidc_task_group @@ -2981,7 +2981,7 @@ buildvariants: - matrix_name: "aws-auth-test-windows" matrix_spec: - platform: [windows-64-vsMulti-small] + platform: [windows] python-version-windows: "*" display_name: "MONGODB-AWS Auth ${platform} ${python-version-windows}" tasks: From f961a98d66156837a030b1e90a2be3173fbee5b8 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 15 Sep 2024 13:17:09 -0500 Subject: [PATCH 3/6] fix platform names --- .evergreen/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 4efe24fd29..a0c464a803 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -2112,7 +2112,7 @@ axes: run_on: rhel82-arm64-small batchtime: 10080 # 7 days variables: - - id: window + - id: windows display_name: "Windows 64" run_on: windows-2022-small batchtime: 10080 # 7 days From 361be4ee2a433f5fd6538e76d0f318e320751695 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 15 Sep 2024 13:17:29 -0500 Subject: [PATCH 4/6] fix platform names --- .evergreen/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index a0c464a803..45754af3bb 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -2107,7 +2107,7 @@ axes: batchtime: 10080 # 7 days variables: SKIP_HATCH: true - - id: rhel82-arm64 + - id: rhel8-arm64 display_name: "RHEL 8 (ARM64)" run_on: rhel82-arm64-small batchtime: 10080 # 7 days From 5e55b16267c13429d9196ece3d7568b8ec99b6e7 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 15 Sep 2024 20:37:31 -0500 Subject: [PATCH 5/6] fix windows name --- .evergreen/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 45754af3bb..043b1b4121 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -2114,7 +2114,7 @@ axes: variables: - id: windows display_name: "Windows 64" - run_on: windows-2022-small + run_on: windows-64-vsMulti-small batchtime: 10080 # 7 days variables: skip_ECS_auth_test: true From 8c7d2be3426a64a3ce0c26252eeabbb6231ad671 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 16 Sep 2024 09:43:40 -0500 Subject: [PATCH 6/6] update rhel8 host --- .evergreen/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 043b1b4121..14e3426b32 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -2081,7 +2081,7 @@ axes: batchtime: 10080 # 7 days - id: rhel8 display_name: "RHEL 8.x" - run_on: rhel87-small + run_on: rhel8.8-small batchtime: 10080 # 7 days - id: rhel9-fips display_name: "RHEL 9 FIPS"