Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PYTHON-4764 Update to use current supported EVG hosts #1858

Merged
merged 6 commits into from
Sep 17, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2081,10 +2081,10 @@ 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: rhel92-fips
display_name: "RHEL 9.2 FIPS"
- id: rhel9-fips
display_name: "RHEL 9 FIPS"
run_on: rhel92-fips
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
run_on: rhel92-fips
run_on: rhel9-fips

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the run_on also need to be changed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the host is still rhel92-fips.

batchtime: 10080 # 7 days
- id: ubuntu-22.04
Expand All @@ -2095,24 +2095,24 @@ 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)"
- id: rhel8-arm64
display_name: "RHEL 8 (ARM64)"
run_on: rhel82-arm64-small
batchtime: 10080 # 7 days
variables:
- id: windows-64-vsMulti-small
- id: windows
display_name: "Windows 64"
run_on: windows-64-vsMulti-small
batchtime: 10080 # 7 days
Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -2698,15 +2698,15 @@ 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}"
tasks: *all-server-versions

- 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}"
Expand All @@ -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: "*"
Expand All @@ -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:
Expand Down Expand Up @@ -2795,7 +2795,7 @@ buildvariants:

- matrix_name: "tests-windows-enterprise-auth"
matrix_spec:
platform: windows-64-vsMulti-small
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

windows-64-vsMulti-small is/was a special distro that was built just for us to test with. I take it we don't need that anymore?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://jira.mongodb.org/browse/BUILD-9934

Ah it was for testing python <=3.4. So yea we don't need it anymore.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just changing the name we give it, not the actual host

platform: windows
python-version-windows: "*"
auth: "auth"
display_name: "Enterprise ${auth} ${platform} ${python-version-windows}"
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Loading