From eff79583bbf08877a3038d12a16ed19cb14f3e73 Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Thu, 24 Oct 2024 12:48:32 +0200
Subject: [PATCH 1/7] chore: Use new distro ids for MacOS and IBM hosts

---
 .evergreen.yml              | 12 ++++++------
 .evergreen/evergreen.yml.in | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index 895ca6cb83..e5affc8675 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -16875,8 +16875,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-power9-small
     expansions:
       executable_os_id: linux-ppc64le
     tasks:
@@ -17063,8 +17063,8 @@ buildvariants:
       - 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
+    display_name: "RHEL 8 PPC (E2E Tests)"
+    run_on: rhel8-power9-small
     tasks:
       - name: e2e_tests_linux_ppc64le
   - name: e2e_rhel72_s390x
@@ -17443,8 +17443,8 @@ buildvariants:
     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
+    display_name: "package smoke tests (RHEL 8 ppc64le)"
+    run_on: rhel8-power9-small
     tasks:
       - name: pkg_test_rpmextract_rpm_ppc64le
 
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index c0827f931f..f034aa793f 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -1666,8 +1666,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-power9-small
     expansions:
       executable_os_id: linux-ppc64le
     tasks:
@@ -1854,8 +1854,8 @@ buildvariants:
       - 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
+    display_name: "RHEL 8 PPC (E2E Tests)"
+    run_on: rhel8-power9-small
     tasks:
       - name: e2e_tests_linux_ppc64le
   - name: e2e_rhel72_s390x
@@ -2006,8 +2006,8 @@ buildvariants:
     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
+    display_name: "package smoke tests (RHEL 8 ppc64le)"
+    run_on: rhel8-power9-small
     tasks:
       - name: pkg_test_rpmextract_rpm_ppc64le
 

From dff30440373250d31fbe3ca02f24eb2dccb55560 Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Thu, 24 Oct 2024 13:23:49 +0200
Subject: [PATCH 2/7] Try a different host name

---
 .evergreen.yml              | 6 +++---
 .evergreen/evergreen.yml.in | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index e5affc8675..e0da45c964 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -16876,7 +16876,7 @@ buildvariants:
       - name: compile_artifact
   - name: linux_ppc64le_build
     display_name: "RHEL 8 PPC (build)"
-    run_on: rhel8-power9-small
+    run_on: rhel89-power9-small
     expansions:
       executable_os_id: linux-ppc64le
     tasks:
@@ -17064,7 +17064,7 @@ buildvariants:
       - name: e2e_tests_linux_arm64_openssl3
   - name: e2e_rhel81_ppc64le
     display_name: "RHEL 8 PPC (E2E Tests)"
-    run_on: rhel8-power9-small
+    run_on: rhel89-power9-small
     tasks:
       - name: e2e_tests_linux_ppc64le
   - name: e2e_rhel72_s390x
@@ -17444,7 +17444,7 @@ buildvariants:
       - name: pkg_test_rpmextract_rpm_s390x
   - name: pkg_smoke_tests_rhel81_ppc64le
     display_name: "package smoke tests (RHEL 8 ppc64le)"
-    run_on: rhel8-power9-small
+    run_on: rhel89-power9-small
     tasks:
       - name: pkg_test_rpmextract_rpm_ppc64le
 
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index f034aa793f..babf6b6523 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -1667,7 +1667,7 @@ buildvariants:
       - name: compile_artifact
   - name: linux_ppc64le_build
     display_name: "RHEL 8 PPC (build)"
-    run_on: rhel8-power9-small
+    run_on: rhel89-power9-small
     expansions:
       executable_os_id: linux-ppc64le
     tasks:
@@ -1855,7 +1855,7 @@ buildvariants:
       - name: e2e_tests_linux_arm64_openssl3
   - name: e2e_rhel81_ppc64le
     display_name: "RHEL 8 PPC (E2E Tests)"
-    run_on: rhel8-power9-small
+    run_on: rhel89-power9-small
     tasks:
       - name: e2e_tests_linux_ppc64le
   - name: e2e_rhel72_s390x
@@ -2007,7 +2007,7 @@ buildvariants:
       - name: pkg_test_rpmextract_rpm_s390x
   - name: pkg_smoke_tests_rhel81_ppc64le
     display_name: "package smoke tests (RHEL 8 ppc64le)"
-    run_on: rhel8-power9-small
+    run_on: rhel89-power9-small
     tasks:
       - name: pkg_test_rpmextract_rpm_ppc64le
 

From cd22a28bc39da72d2f92ca89db8d3bc68f55eaba Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Thu, 24 Oct 2024 13:24:37 +0200
Subject: [PATCH 3/7] Try 3

---
 .evergreen.yml              | 6 +++---
 .evergreen/evergreen.yml.in | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index e0da45c964..a34b1ce37b 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -16876,7 +16876,7 @@ buildvariants:
       - name: compile_artifact
   - name: linux_ppc64le_build
     display_name: "RHEL 8 PPC (build)"
-    run_on: rhel89-power9-small
+    run_on: rhel8-power9
     expansions:
       executable_os_id: linux-ppc64le
     tasks:
@@ -17064,7 +17064,7 @@ buildvariants:
       - name: e2e_tests_linux_arm64_openssl3
   - name: e2e_rhel81_ppc64le
     display_name: "RHEL 8 PPC (E2E Tests)"
-    run_on: rhel89-power9-small
+    run_on: rhel8-power9
     tasks:
       - name: e2e_tests_linux_ppc64le
   - name: e2e_rhel72_s390x
@@ -17444,7 +17444,7 @@ buildvariants:
       - name: pkg_test_rpmextract_rpm_s390x
   - name: pkg_smoke_tests_rhel81_ppc64le
     display_name: "package smoke tests (RHEL 8 ppc64le)"
-    run_on: rhel89-power9-small
+    run_on: rhel8-power9
     tasks:
       - name: pkg_test_rpmextract_rpm_ppc64le
 
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index babf6b6523..ee9cbe5747 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -1667,7 +1667,7 @@ buildvariants:
       - name: compile_artifact
   - name: linux_ppc64le_build
     display_name: "RHEL 8 PPC (build)"
-    run_on: rhel89-power9-small
+    run_on: rhel8-power9
     expansions:
       executable_os_id: linux-ppc64le
     tasks:
@@ -1855,7 +1855,7 @@ buildvariants:
       - name: e2e_tests_linux_arm64_openssl3
   - name: e2e_rhel81_ppc64le
     display_name: "RHEL 8 PPC (E2E Tests)"
-    run_on: rhel89-power9-small
+    run_on: rhel8-power9
     tasks:
       - name: e2e_tests_linux_ppc64le
   - name: e2e_rhel72_s390x
@@ -2007,7 +2007,7 @@ buildvariants:
       - name: pkg_test_rpmextract_rpm_s390x
   - name: pkg_smoke_tests_rhel81_ppc64le
     display_name: "package smoke tests (RHEL 8 ppc64le)"
-    run_on: rhel89-power9-small
+    run_on: rhel8-power9
     tasks:
       - name: pkg_test_rpmextract_rpm_ppc64le
 

From 45995e6f7f6c39b50be8e4b5f4fa152f71abb569 Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Thu, 24 Oct 2024 16:32:54 +0200
Subject: [PATCH 4/7] Use power instead of power9

---
 .evergreen.yml              | 6 +++---
 .evergreen/evergreen.yml.in | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index a34b1ce37b..52bfddf853 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -16876,7 +16876,7 @@ buildvariants:
       - name: compile_artifact
   - name: linux_ppc64le_build
     display_name: "RHEL 8 PPC (build)"
-    run_on: rhel8-power9
+    run_on: rhel8-power-small
     expansions:
       executable_os_id: linux-ppc64le
     tasks:
@@ -17064,7 +17064,7 @@ buildvariants:
       - name: e2e_tests_linux_arm64_openssl3
   - name: e2e_rhel81_ppc64le
     display_name: "RHEL 8 PPC (E2E Tests)"
-    run_on: rhel8-power9
+    run_on: rhel8-power-small
     tasks:
       - name: e2e_tests_linux_ppc64le
   - name: e2e_rhel72_s390x
@@ -17444,7 +17444,7 @@ buildvariants:
       - name: pkg_test_rpmextract_rpm_s390x
   - name: pkg_smoke_tests_rhel81_ppc64le
     display_name: "package smoke tests (RHEL 8 ppc64le)"
-    run_on: rhel8-power9
+    run_on: rhel8-power-small
     tasks:
       - name: pkg_test_rpmextract_rpm_ppc64le
 
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index ee9cbe5747..b85120e197 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -1667,7 +1667,7 @@ buildvariants:
       - name: compile_artifact
   - name: linux_ppc64le_build
     display_name: "RHEL 8 PPC (build)"
-    run_on: rhel8-power9
+    run_on: rhel8-power-small
     expansions:
       executable_os_id: linux-ppc64le
     tasks:
@@ -1855,7 +1855,7 @@ buildvariants:
       - name: e2e_tests_linux_arm64_openssl3
   - name: e2e_rhel81_ppc64le
     display_name: "RHEL 8 PPC (E2E Tests)"
-    run_on: rhel8-power9
+    run_on: rhel8-power-small
     tasks:
       - name: e2e_tests_linux_ppc64le
   - name: e2e_rhel72_s390x
@@ -2007,7 +2007,7 @@ buildvariants:
       - name: pkg_test_rpmextract_rpm_s390x
   - name: pkg_smoke_tests_rhel81_ppc64le
     display_name: "package smoke tests (RHEL 8 ppc64le)"
-    run_on: rhel8-power9
+    run_on: rhel8-power-small
     tasks:
       - name: pkg_test_rpmextract_rpm_ppc64le
 

From b2ed31a6be6aa6ad769528d88af8ed94afcda85a Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Wed, 30 Oct 2024 21:58:57 +0100
Subject: [PATCH 5/7] Update context-expansions

---
 .evergreen.yml                                    | 4 ++--
 .evergreen/compilation-context-expansions.sh      | 2 +-
 .evergreen/compilation-context-expansions.test.sh | 3 ++-
 .evergreen/evergreen.yml.in                       | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index ad957b9139..31c083a33a 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -17370,7 +17370,7 @@ buildvariants:
     tasks:
       - name: e2e_tests_linux_arm64
       - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_rhel81_ppc64le
+  - name: e2e_rhel8_ppc64le
     display_name: "RHEL 8 PPC (E2E Tests)"
     run_on: rhel8-power-small
     tasks:
@@ -17750,7 +17750,7 @@ buildvariants:
     run_on: rhel8-zseries-small
     tasks:
       - name: pkg_test_rpmextract_rpm_s390x
-  - name: pkg_smoke_tests_rhel81_ppc64le
+  - name: pkg_smoke_tests_rhel8_ppc64le
     display_name: "package smoke tests (RHEL 8 ppc64le)"
     run_on: rhel8-power-small
     tasks:
diff --git a/.evergreen/compilation-context-expansions.sh b/.evergreen/compilation-context-expansions.sh
index 60a0f2c2c6..592625855e 100644
--- 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
index 248b4e29a6..ebaba12846 100755
--- 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
index 2920e8a79b..ae96b4da0f 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -1863,7 +1863,7 @@ buildvariants:
     tasks:
       - name: e2e_tests_linux_arm64
       - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_rhel81_ppc64le
+  - name: e2e_rhel8_ppc64le
     display_name: "RHEL 8 PPC (E2E Tests)"
     run_on: rhel8-power-small
     tasks:
@@ -2015,7 +2015,7 @@ buildvariants:
     run_on: rhel8-zseries-small
     tasks:
       - name: pkg_test_rpmextract_rpm_s390x
-  - name: pkg_smoke_tests_rhel81_ppc64le
+  - name: pkg_smoke_tests_rhel8_ppc64le
     display_name: "package smoke tests (RHEL 8 ppc64le)"
     run_on: rhel8-power-small
     tasks:

From 5875532323483e1a6d15316ef067e98ea1b3399a Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Mon, 4 Nov 2024 16:34:07 +0100
Subject: [PATCH 6/7] Try to use toolchain v4

---
 .evergreen/install-node-source.sh | 10 ++++++++++
 .evergreen/setup-env.sh           | 11 ++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/.evergreen/install-node-source.sh b/.evergreen/install-node-source.sh
index 62a3ef0633..e7151d43e4 100755
--- 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" = "aarch64" ] || [ "$OS_ARCH" = "arm64" ] ; 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
index 0100a0c015..6c83dc943c 100755
--- 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" = "aarch64" ] || [ "$OS_ARCH" = "arm64" ] ; 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

From b1d3464b77c8a0ffed74bccb05cd4c5c475ca5ac Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Mon, 4 Nov 2024 20:17:20 +0100
Subject: [PATCH 7/7] Actually use v4 for ppc hosts

---
 .evergreen/install-node-source.sh | 2 +-
 .evergreen/setup-env.sh           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.evergreen/install-node-source.sh b/.evergreen/install-node-source.sh
index e7151d43e4..ef4deb3cc5 100755
--- a/.evergreen/install-node-source.sh
+++ b/.evergreen/install-node-source.sh
@@ -8,7 +8,7 @@ NVM_DIR="$EVGDIR/.nvm"
 ORIGINAL_PATH="${PATH}"
 
 OS_ARCH="$(uname "-m")"
-if [ "$OS_ARCH" = "aarch64" ] || [ "$OS_ARCH" = "arm64" ] ; then
+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
diff --git a/.evergreen/setup-env.sh b/.evergreen/setup-env.sh
index 6c83dc943c..8b9a38ad95 100755
--- a/.evergreen/setup-env.sh
+++ b/.evergreen/setup-env.sh
@@ -2,7 +2,7 @@ set -e
 set -x
 
 OS_ARCH="$(uname "-m")"
-if [ "$OS_ARCH" = "aarch64" ] || [ "$OS_ARCH" = "arm64" ] ; then
+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