Skip to content

Commit a9df9e0

Browse files
authored
chore: Migrate rhel72-zseries to rhel7-zseries MONGOSH-1835 (#2238)
1 parent e78998f commit a9df9e0

File tree

10 files changed

+4786
-31503
lines changed

10 files changed

+4786
-31503
lines changed

.evergreen.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17190,8 +17190,8 @@ buildvariants:
1719017190
tasks:
1719117191
- name: compile_artifact
1719217192
- name: linux_s390x_build
17193-
display_name: "RHEL 7.2 s390x (build)"
17194-
run_on: rhel72-zseries-large
17193+
display_name: "RHEL 7 s390x (build)"
17194+
run_on: rhel7-zseries-large
1719517195
expansions:
1719617196
executable_os_id: linux-s390x
1719717197
tasks:
@@ -17375,14 +17375,14 @@ buildvariants:
1737517375
run_on: rhel81-power8-small
1737617376
tasks:
1737717377
- name: e2e_tests_linux_ppc64le
17378-
- name: e2e_rhel72_s390x
17379-
display_name: "RHEL 7.2 s390x (E2E Tests)"
17380-
run_on: rhel72-zseries-large
17378+
- name: e2e_rhel7_s390x
17379+
display_name: "RHEL 7 s390x (E2E Tests)"
17380+
run_on: rhel7-zseries-large
1738117381
tasks:
1738217382
- name: e2e_tests_linux_s390x_60x
17383-
- name: e2e_rhel83_s390x
17384-
display_name: "RHEL 8.3 s390x (E2E Tests)"
17385-
run_on: rhel83-zseries-small
17383+
- name: e2e_rhel8_s390x
17384+
display_name: "RHEL 8 s390x (E2E Tests)"
17385+
run_on: rhel8-zseries-small
1738617386
tasks:
1738717387
- name: e2e_tests_linux_s390x
1738817388
- name: e2e_macos14_x64
@@ -17738,16 +17738,16 @@ buildvariants:
1773817738
run_on: macos-14-arm64
1773917739
tasks:
1774017740
- name: pkg_test_macos_darwin_arm64
17741-
- name: pkg_smoke_tests_rhel72_s390x
17742-
display_name: "package smoke tests (RHEL 7.2 s390x)"
17743-
run_on: rhel72-zseries-small
17741+
- name: pkg_smoke_tests_rhel7_s390x
17742+
display_name: "package smoke tests (RHEL 7 s390x)"
17743+
run_on: rhel7-zseries-small
1774417744
expansions:
1774517745
no_automatic_encryption_support: 1
1774617746
tasks:
1774717747
- name: pkg_test_rpmextract_rpm_s390x
17748-
- name: pkg_smoke_tests_rhel83_s390x
17749-
display_name: "package smoke tests (RHEL 8.3 s390x)"
17750-
run_on: rhel83-zseries-small
17748+
- name: pkg_smoke_tests_rhel8_s390x
17749+
display_name: "package smoke tests (RHEL 8 s390x)"
17750+
run_on: rhel8-zseries-small
1775117751
tasks:
1775217752
- name: pkg_test_rpmextract_rpm_s390x
1775317753
- name: pkg_smoke_tests_rhel81_ppc64le

.evergreen/compilation-context-expansions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel72-zseries|rhel81-power8|amazon2-arm64|macos)"
1+
export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel7-zseries|rhel81-power8|amazon2-arm64|macos)"
22
export COMPILING_CONTEXT_FILE="$(pwd)/../tmp/compiling-context.yml"
33

44
if ! [[ "$DISTRO_ID" =~ $DISTRO_UPLOADLIST_REGEX ]]; then

.evergreen/compilation-context-expansions.test.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@ macos-11-arm64=true
2525
macos-13-arm64=true
2626
rhel70-build=true
2727
rhel70-large=true
28-
rhel72-zseries-large=true
29-
rhel72-zseries-small=true
28+
rhel72-zseries-large=false
29+
rhel72-zseries-small=false
30+
rhel7-zseries-large=true
31+
rhel7-zseries-small=true
3032
rhel76-large=false
3133
rhel80-small=false
3234
rhel81-power8-small=true
3335
rhel82-arm64-small=false
3436
rhel83-fips=false
3537
rhel83-zseries-small=false
38+
rhel8-zseries-small=false
3639
rhel90-arm64-small=false
3740
rhel90-small=false
3841
rhel93-fips=false

.evergreen/evergreen.yml.in

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1683,8 +1683,8 @@ buildvariants:
16831683
tasks:
16841684
- name: compile_artifact
16851685
- name: linux_s390x_build
1686-
display_name: "RHEL 7.2 s390x (build)"
1687-
run_on: rhel72-zseries-large
1686+
display_name: "RHEL 7 s390x (build)"
1687+
run_on: rhel7-zseries-large
16881688
expansions:
16891689
executable_os_id: linux-s390x
16901690
tasks:
@@ -1868,14 +1868,14 @@ buildvariants:
18681868
run_on: rhel81-power8-small
18691869
tasks:
18701870
- name: e2e_tests_linux_ppc64le
1871-
- name: e2e_rhel72_s390x
1872-
display_name: "RHEL 7.2 s390x (E2E Tests)"
1873-
run_on: rhel72-zseries-large
1871+
- name: e2e_rhel7_s390x
1872+
display_name: "RHEL 7 s390x (E2E Tests)"
1873+
run_on: rhel7-zseries-large
18741874
tasks:
18751875
- name: e2e_tests_linux_s390x_60x
1876-
- name: e2e_rhel83_s390x
1877-
display_name: "RHEL 8.3 s390x (E2E Tests)"
1878-
run_on: rhel83-zseries-small
1876+
- name: e2e_rhel8_s390x
1877+
display_name: "RHEL 8 s390x (E2E Tests)"
1878+
run_on: rhel8-zseries-small
18791879
tasks:
18801880
- name: e2e_tests_linux_s390x
18811881
- name: e2e_macos14_x64
@@ -2003,16 +2003,16 @@ buildvariants:
20032003
run_on: macos-14-arm64
20042004
tasks:
20052005
- name: pkg_test_macos_darwin_arm64
2006-
- name: pkg_smoke_tests_rhel72_s390x
2007-
display_name: "package smoke tests (RHEL 7.2 s390x)"
2008-
run_on: rhel72-zseries-small
2006+
- name: pkg_smoke_tests_rhel7_s390x
2007+
display_name: "package smoke tests (RHEL 7 s390x)"
2008+
run_on: rhel7-zseries-small
20092009
expansions:
20102010
no_automatic_encryption_support: 1
20112011
tasks:
20122012
- name: pkg_test_rpmextract_rpm_s390x
2013-
- name: pkg_smoke_tests_rhel83_s390x
2014-
display_name: "package smoke tests (RHEL 8.3 s390x)"
2015-
run_on: rhel83-zseries-small
2013+
- name: pkg_smoke_tests_rhel8_s390x
2014+
display_name: "package smoke tests (RHEL 8 s390x)"
2015+
run_on: rhel8-zseries-small
20162016
tasks:
20172017
- name: pkg_test_rpmextract_rpm_s390x
20182018
- name: pkg_smoke_tests_rhel81_ppc64le

0 commit comments

Comments
 (0)