Skip to content

chore: Migrate rhel81-power8 to rhel8-power9 MONGOSH-1835 #2236

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.

Sign up for GitHub

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

Merged
nirinchev merged 10 commits into from
Nov 5, 2024
Merged

chore: Migrate rhel81-power8 to rhel8-power9 MONGOSH-1835 #2236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eff7958
chore: Use new distro ids for MacOS and IBM hosts
nirinchev Oct 24, 2024
dff3044
Try a different host name
nirinchev Oct 24, 2024
cd22a28
Try 3
nirinchev Oct 24, 2024
45995e6
Use power instead of power9
nirinchev Oct 24, 2024
5d75866
Merge branch 'main' into ni/new-distros
nirinchev Oct 25, 2024
d3ae043
Merge branch 'main' into ni/new-distros
nirinchev Oct 30, 2024
b2ed31a
Update context-expansions
nirinchev Oct 30, 2024
25b29f4
Merge branch 'main' into ni/new-distros
nirinchev Oct 30, 2024
5875532
Try to use toolchain v4
nirinchev Nov 4, 2024
b1d3464
Actually use v4 for ppc hosts
nirinchev Nov 4, 2024
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
16 changes: 8 additions & 8 deletions .evergreen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .evergreen/compilation-context-expansions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion .evergreen/compilation-context-expansions.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions .evergreen/evergreen.yml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
10 changes: 10 additions & 0 deletions .evergreen/install-node-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Collaborator

@addaleax addaleax Nov 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small note, in scripts that already have set -x set, echoing back debug information can be nice for formatting but doesn't usually provide other benefits, since bash will already echo back the values for OS_ARCH, PATH, etc. when they are being set

Copy link
Collaborator Author

@nirinchev nirinchev Nov 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I guess there's a small benefit of making this easier to grep if you notice it in the parsley logs + that was the original code before it got removed in 315fefa, so figured might keep it like that. I don't have strong opinions though and happy to remove it to keep the script more concise.

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++
Expand Down
11 changes: 10 additions & 1 deletion .evergreen/setup-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading