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

chore: Migrate rhel72-zseries to rhel7-zseries MONGOSH-1835 #2238

Merged
merged 9 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
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
28 changes: 14 additions & 14 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17190,8 +17190,8 @@ buildvariants:
tasks:
- name: compile_artifact
- name: linux_s390x_build
display_name: "RHEL 7.2 s390x (build)"
run_on: rhel72-zseries-large
display_name: "RHEL 7 s390x (build)"
run_on: rhel7-zseries-large
expansions:
executable_os_id: linux-s390x
tasks:
Expand Down Expand Up @@ -17375,14 +17375,14 @@ buildvariants:
run_on: rhel81-power8-small
tasks:
- name: e2e_tests_linux_ppc64le
- name: e2e_rhel72_s390x
display_name: "RHEL 7.2 s390x (E2E Tests)"
run_on: rhel72-zseries-large
- name: e2e_rhel7_s390x
display_name: "RHEL 7 s390x (E2E Tests)"
run_on: rhel7-zseries-large
tasks:
- name: e2e_tests_linux_s390x_60x
- name: e2e_rhel83_s390x
display_name: "RHEL 8.3 s390x (E2E Tests)"
run_on: rhel83-zseries-small
- name: e2e_rhel8_s390x
display_name: "RHEL 8 s390x (E2E Tests)"
run_on: rhel8-zseries-small
tasks:
- name: e2e_tests_linux_s390x
- name: e2e_macos14_x64
Expand Down Expand Up @@ -17738,16 +17738,16 @@ buildvariants:
run_on: macos-14-arm64
tasks:
- name: pkg_test_macos_darwin_arm64
- name: pkg_smoke_tests_rhel72_s390x
display_name: "package smoke tests (RHEL 7.2 s390x)"
run_on: rhel72-zseries-small
- name: pkg_smoke_tests_rhel7_s390x
display_name: "package smoke tests (RHEL 7 s390x)"
run_on: rhel7-zseries-small
expansions:
no_automatic_encryption_support: 1
tasks:
- name: pkg_test_rpmextract_rpm_s390x
- name: pkg_smoke_tests_rhel83_s390x
display_name: "package smoke tests (RHEL 8.3 s390x)"
run_on: rhel83-zseries-small
- name: pkg_smoke_tests_rhel8_s390x
display_name: "package smoke tests (RHEL 8 s390x)"
run_on: rhel8-zseries-small
tasks:
- name: pkg_test_rpmextract_rpm_s390x
- name: pkg_smoke_tests_rhel81_ppc64le
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/compilation-context-expansions.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel72-zseries|rhel81-power8|amazon2-arm64|macos)"
export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel7-zseries|rhel81-power8|amazon2-arm64|macos)"
export COMPILING_CONTEXT_FILE="$(pwd)/../tmp/compiling-context.yml"

if ! [[ "$DISTRO_ID" =~ $DISTRO_UPLOADLIST_REGEX ]]; then
Expand Down
7 changes: 5 additions & 2 deletions .evergreen/compilation-context-expansions.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,17 @@ macos-11-arm64=true
macos-13-arm64=true
rhel70-build=true
rhel70-large=true
rhel72-zseries-large=true
rhel72-zseries-small=true
rhel72-zseries-large=false
rhel72-zseries-small=false
rhel7-zseries-large=true
rhel7-zseries-small=true
rhel76-large=false
rhel80-small=false
rhel81-power8-small=true
rhel82-arm64-small=false
rhel83-fips=false
rhel83-zseries-small=false
rhel8-zseries-small=false
rhel90-arm64-small=false
rhel90-small=false
rhel93-fips=false
Expand Down
28 changes: 14 additions & 14 deletions .evergreen/evergreen.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -1683,8 +1683,8 @@ buildvariants:
tasks:
- name: compile_artifact
- name: linux_s390x_build
display_name: "RHEL 7.2 s390x (build)"
run_on: rhel72-zseries-large
display_name: "RHEL 7 s390x (build)"
run_on: rhel7-zseries-large
expansions:
executable_os_id: linux-s390x
tasks:
Expand Down Expand Up @@ -1868,14 +1868,14 @@ buildvariants:
run_on: rhel81-power8-small
tasks:
- name: e2e_tests_linux_ppc64le
- name: e2e_rhel72_s390x
display_name: "RHEL 7.2 s390x (E2E Tests)"
run_on: rhel72-zseries-large
- name: e2e_rhel7_s390x
display_name: "RHEL 7 s390x (E2E Tests)"
run_on: rhel7-zseries-large
tasks:
- name: e2e_tests_linux_s390x_60x
- name: e2e_rhel83_s390x
display_name: "RHEL 8.3 s390x (E2E Tests)"
run_on: rhel83-zseries-small
- name: e2e_rhel8_s390x
display_name: "RHEL 8 s390x (E2E Tests)"
run_on: rhel8-zseries-small
tasks:
- name: e2e_tests_linux_s390x
- name: e2e_macos14_x64
Expand Down Expand Up @@ -2003,16 +2003,16 @@ buildvariants:
run_on: macos-14-arm64
tasks:
- name: pkg_test_macos_darwin_arm64
- name: pkg_smoke_tests_rhel72_s390x
display_name: "package smoke tests (RHEL 7.2 s390x)"
run_on: rhel72-zseries-small
- name: pkg_smoke_tests_rhel7_s390x
display_name: "package smoke tests (RHEL 7 s390x)"
run_on: rhel7-zseries-small
expansions:
no_automatic_encryption_support: 1
tasks:
- name: pkg_test_rpmextract_rpm_s390x
- name: pkg_smoke_tests_rhel83_s390x
display_name: "package smoke tests (RHEL 8.3 s390x)"
run_on: rhel83-zseries-small
- name: pkg_smoke_tests_rhel8_s390x
display_name: "package smoke tests (RHEL 8 s390x)"
run_on: rhel8-zseries-small
tasks:
- name: pkg_test_rpmextract_rpm_s390x
- name: pkg_smoke_tests_rhel81_ppc64le
Expand Down
Loading
Loading