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
mongodb-js · Nov 5, 2024 · ea58f30 · ea58f30
1 parent dd7f499
commit ea58f30
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 19 deletions.
diff --git a/.evergreen.yml b/.evergreen.yml
@@ -17183,8 +17183,8 @@ buildvariants:
     tasks:
       - name: compile_artifact
   - name: linux_ppc64le_build
-    display_name: "RHEL 8.1 PPC (build)"
-    run_on: rhel81-power8-small
+    display_name: "RHEL 8 PPC (build)"
+    run_on: rhel8-power-small
     expansions:
       executable_os_id: linux-ppc64le
     tasks:
@@ -17370,9 +17370,9 @@ buildvariants:
     tasks:
       - name: e2e_tests_linux_arm64
       - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_rhel81_ppc64le
-    display_name: "RHEL 8.1 PPC (E2E Tests)"
-    run_on: rhel81-power8-small
+  - name: e2e_rhel8_ppc64le
+    display_name: "RHEL 8 PPC (E2E Tests)"
+    run_on: rhel8-power-small
     tasks:
       - name: e2e_tests_linux_ppc64le
   - name: e2e_rhel7_s390x
@@ -17750,9 +17750,9 @@ buildvariants:
     run_on: rhel8-zseries-small
     tasks:
       - name: pkg_test_rpmextract_rpm_s390x
-  - name: pkg_smoke_tests_rhel81_ppc64le
-    display_name: "package smoke tests (RHEL 8.1 ppc64le)"
-    run_on: rhel81-power8-small
+  - name: pkg_smoke_tests_rhel8_ppc64le
+    display_name: "package smoke tests (RHEL 8 ppc64le)"
+    run_on: rhel8-power-small
     tasks:
       - name: pkg_test_rpmextract_rpm_ppc64le
 

diff --git a/.evergreen/compilation-context-expansions.sh b/.evergreen/compilation-context-expansions.sh
@@ -1,4 +1,4 @@
-export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel7-zseries|rhel81-power8|amazon2-arm64|macos)"
+export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel7-zseries|rhel8-power|amazon2-arm64|macos)"
 export COMPILING_CONTEXT_FILE="$(pwd)/../tmp/compiling-context.yml"
 
 if ! [[ "$DISTRO_ID" =~ $DISTRO_UPLOADLIST_REGEX ]]; then

diff --git a/.evergreen/compilation-context-expansions.test.sh b/.evergreen/compilation-context-expansions.test.sh
@@ -31,7 +31,8 @@ rhel7-zseries-large=true
 rhel7-zseries-small=true
 rhel76-large=false
 rhel80-small=false
-rhel81-power8-small=true
+rhel81-power8-small=false
+rhel8-power-small=true
 rhel82-arm64-small=false
 rhel83-fips=false
 rhel83-zseries-small=false

diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
@@ -1676,8 +1676,8 @@ buildvariants:
     tasks:
       - name: compile_artifact
   - name: linux_ppc64le_build
-    display_name: "RHEL 8.1 PPC (build)"
-    run_on: rhel81-power8-small
+    display_name: "RHEL 8 PPC (build)"
+    run_on: rhel8-power-small
     expansions:
       executable_os_id: linux-ppc64le
     tasks:
@@ -1863,9 +1863,9 @@ buildvariants:
     tasks:
       - name: e2e_tests_linux_arm64
       - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_rhel81_ppc64le
-    display_name: "RHEL 8.1 PPC (E2E Tests)"
-    run_on: rhel81-power8-small
+  - name: e2e_rhel8_ppc64le
+    display_name: "RHEL 8 PPC (E2E Tests)"
+    run_on: rhel8-power-small
     tasks:
       - name: e2e_tests_linux_ppc64le
   - name: e2e_rhel7_s390x
@@ -2015,9 +2015,9 @@ buildvariants:
     run_on: rhel8-zseries-small
     tasks:
       - name: pkg_test_rpmextract_rpm_s390x
-  - name: pkg_smoke_tests_rhel81_ppc64le
-    display_name: "package smoke tests (RHEL 8.1 ppc64le)"
-    run_on: rhel81-power8-small
+  - name: pkg_smoke_tests_rhel8_ppc64le
+    display_name: "package smoke tests (RHEL 8 ppc64le)"
+    run_on: rhel8-power-small
     tasks:
       - name: pkg_test_rpmextract_rpm_ppc64le
 

diff --git a/.evergreen/install-node-source.sh b/.evergreen/install-node-source.sh
@@ -7,6 +7,16 @@ EVGDIR="$ROOT_DIR/.evergreen"
 NVM_DIR="$EVGDIR/.nvm"
 ORIGINAL_PATH="${PATH}"
 
+OS_ARCH="$(uname "-m")"
+if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ] ; then
+    echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
+    export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
+else
+    echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
+    export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
+fi
+export PATH="$TOOLCHAIN_PATH:/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
+
 export PATH="/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
 export CC=gcc
 export CXX=g++

diff --git a/.evergreen/setup-env.sh b/.evergreen/setup-env.sh
@@ -1,8 +1,17 @@
 set -e
 set -x
 
+OS_ARCH="$(uname "-m")"
+if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ] ; then
+    echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
+    export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
+else
+    echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
+    export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
+fi
+
 export BASEDIR="$PWD/.evergreen"
-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"
+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"
 
 export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
 export IS_MONGOSH_EVERGREEN_CI=1