Skip to content

Commit ea58f30

Browse files
authored
chore: Migrate rhel81-power8 to rhel8-power9 MONGOSH-1835 (#2236)
* chore: Use new distro ids for MacOS and IBM hosts * Try a different host name * Try 3 * Use power instead of power9 * Update context-expansions * Try to use toolchain v4 * Actually use v4 for ppc hosts
1 parent dd7f499 commit ea58f30

File tree

6 files changed

+39
-19
lines changed

6 files changed

+39
-19
lines changed

.evergreen.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17183,8 +17183,8 @@ buildvariants:
1718317183
tasks:
1718417184
- name: compile_artifact
1718517185
- name: linux_ppc64le_build
17186-
display_name: "RHEL 8.1 PPC (build)"
17187-
run_on: rhel81-power8-small
17186+
display_name: "RHEL 8 PPC (build)"
17187+
run_on: rhel8-power-small
1718817188
expansions:
1718917189
executable_os_id: linux-ppc64le
1719017190
tasks:
@@ -17370,9 +17370,9 @@ buildvariants:
1737017370
tasks:
1737117371
- name: e2e_tests_linux_arm64
1737217372
- name: e2e_tests_linux_arm64_openssl3
17373-
- name: e2e_rhel81_ppc64le
17374-
display_name: "RHEL 8.1 PPC (E2E Tests)"
17375-
run_on: rhel81-power8-small
17373+
- name: e2e_rhel8_ppc64le
17374+
display_name: "RHEL 8 PPC (E2E Tests)"
17375+
run_on: rhel8-power-small
1737617376
tasks:
1737717377
- name: e2e_tests_linux_ppc64le
1737817378
- name: e2e_rhel7_s390x
@@ -17750,9 +17750,9 @@ buildvariants:
1775017750
run_on: rhel8-zseries-small
1775117751
tasks:
1775217752
- name: pkg_test_rpmextract_rpm_s390x
17753-
- name: pkg_smoke_tests_rhel81_ppc64le
17754-
display_name: "package smoke tests (RHEL 8.1 ppc64le)"
17755-
run_on: rhel81-power8-small
17753+
- name: pkg_smoke_tests_rhel8_ppc64le
17754+
display_name: "package smoke tests (RHEL 8 ppc64le)"
17755+
run_on: rhel8-power-small
1775617756
tasks:
1775717757
- name: pkg_test_rpmextract_rpm_ppc64le
1775817758

.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|rhel7-zseries|rhel81-power8|amazon2-arm64|macos)"
1+
export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel7-zseries|rhel8-power|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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ rhel7-zseries-large=true
3131
rhel7-zseries-small=true
3232
rhel76-large=false
3333
rhel80-small=false
34-
rhel81-power8-small=true
34+
rhel81-power8-small=false
35+
rhel8-power-small=true
3536
rhel82-arm64-small=false
3637
rhel83-fips=false
3738
rhel83-zseries-small=false

.evergreen/evergreen.yml.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,8 +1676,8 @@ buildvariants:
16761676
tasks:
16771677
- name: compile_artifact
16781678
- name: linux_ppc64le_build
1679-
display_name: "RHEL 8.1 PPC (build)"
1680-
run_on: rhel81-power8-small
1679+
display_name: "RHEL 8 PPC (build)"
1680+
run_on: rhel8-power-small
16811681
expansions:
16821682
executable_os_id: linux-ppc64le
16831683
tasks:
@@ -1863,9 +1863,9 @@ buildvariants:
18631863
tasks:
18641864
- name: e2e_tests_linux_arm64
18651865
- name: e2e_tests_linux_arm64_openssl3
1866-
- name: e2e_rhel81_ppc64le
1867-
display_name: "RHEL 8.1 PPC (E2E Tests)"
1868-
run_on: rhel81-power8-small
1866+
- name: e2e_rhel8_ppc64le
1867+
display_name: "RHEL 8 PPC (E2E Tests)"
1868+
run_on: rhel8-power-small
18691869
tasks:
18701870
- name: e2e_tests_linux_ppc64le
18711871
- name: e2e_rhel7_s390x
@@ -2015,9 +2015,9 @@ buildvariants:
20152015
run_on: rhel8-zseries-small
20162016
tasks:
20172017
- name: pkg_test_rpmextract_rpm_s390x
2018-
- name: pkg_smoke_tests_rhel81_ppc64le
2019-
display_name: "package smoke tests (RHEL 8.1 ppc64le)"
2020-
run_on: rhel81-power8-small
2018+
- name: pkg_smoke_tests_rhel8_ppc64le
2019+
display_name: "package smoke tests (RHEL 8 ppc64le)"
2020+
run_on: rhel8-power-small
20212021
tasks:
20222022
- name: pkg_test_rpmextract_rpm_ppc64le
20232023

.evergreen/install-node-source.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ EVGDIR="$ROOT_DIR/.evergreen"
77
NVM_DIR="$EVGDIR/.nvm"
88
ORIGINAL_PATH="${PATH}"
99

10+
OS_ARCH="$(uname "-m")"
11+
if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ] ; then
12+
echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
13+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
14+
else
15+
echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
16+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
17+
fi
18+
export PATH="$TOOLCHAIN_PATH:/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
19+
1020
export PATH="/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
1121
export CC=gcc
1222
export CXX=g++

.evergreen/setup-env.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
set -e
22
set -x
33

4+
OS_ARCH="$(uname "-m")"
5+
if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ] ; then
6+
echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
7+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
8+
else
9+
echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
10+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
11+
fi
12+
413
export BASEDIR="$PWD/.evergreen"
5-
export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/opt/python/3.6/bin:$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-10/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/cmake/bin:/opt/mongodbtoolchain/v3/bin:$PATH"
14+
export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/opt/python/3.6/bin:$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-10/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/cmake/bin:$TOOLCHAIN_PATH:$PATH"
615

716
export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
817
export IS_MONGOSH_EVERGREEN_CI=1

0 commit comments

Comments
 (0)