From d88b273c1a9dd7cb598df789ffa9ea3b27147c35 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 4 Sep 2024 11:41:02 -0500 Subject: [PATCH 1/5] Fix support for rhel 7 --- .evergreen/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 9269349a..f56d3180 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1236,6 +1236,10 @@ axes: display_name: "Ubuntu 20.04 (ARM64)" run_on: ubuntu2004-arm64-small + - id: rhel79-small + display_name: "RHEL 7" + run_on: rhel79-small + - id: rhel87-power8 display_name: "RHEL 8 (POWER8)" run_on: rhel81-power8-small From a15a546dfbef6ddddc76825471d2b5e2f58286e4 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 4 Sep 2024 13:46:59 -0500 Subject: [PATCH 2/5] try with rhel70-small --- .evergreen/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index f56d3180..8583ea90 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1236,9 +1236,9 @@ axes: display_name: "Ubuntu 20.04 (ARM64)" run_on: ubuntu2004-arm64-small - - id: rhel79-small + - id: rhel70-small display_name: "RHEL 7" - run_on: rhel79-small + run_on: rhel70-small - id: rhel87-power8 display_name: "RHEL 8 (POWER8)" From 86230922b63e653da7a57a8b4b92a02347d4734f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 4 Sep 2024 13:55:03 -0500 Subject: [PATCH 3/5] try with fallback --- .evergreen/start-orchestration.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/start-orchestration.sh b/.evergreen/start-orchestration.sh index b35b0dab..16877b04 100755 --- a/.evergreen/start-orchestration.sh +++ b/.evergreen/start-orchestration.sh @@ -34,8 +34,8 @@ echo "Creating virtual environment 'venv'..." venvcreate "${PYTHON:?}" venv echo "Creating virtual environment 'venv'... done." -# Install from github to get the latest mongo-orchestration. -python -m pip install -q --upgrade 'https://github.com/mongodb/mongo-orchestration/archive/master.tar.gz' +# Install from github to get the latest mongo-orchestration, fall back on published wheel. +python -m pip install -q --upgrade 'https://github.com/mongodb/mongo-orchestration/archive/master.tar.gz' || python -m pip install -q --upgrade mongo-orchestration python -m pip list cd $DRIVERS_TOOLS From e76af5f95cf665f0d2e2b4536b6322d0081ee91a Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 4 Sep 2024 14:21:29 -0500 Subject: [PATCH 4/5] add comment --- .evergreen/start-orchestration.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.evergreen/start-orchestration.sh b/.evergreen/start-orchestration.sh index 16877b04..af313439 100755 --- a/.evergreen/start-orchestration.sh +++ b/.evergreen/start-orchestration.sh @@ -35,6 +35,8 @@ venvcreate "${PYTHON:?}" venv echo "Creating virtual environment 'venv'... done." # Install from github to get the latest mongo-orchestration, fall back on published wheel. +# The fallback was added to accommodate RHEL 7.0, whose version of glibc does not support the +# hatchling backend used by mongo-orchestration. python -m pip install -q --upgrade 'https://github.com/mongodb/mongo-orchestration/archive/master.tar.gz' || python -m pip install -q --upgrade mongo-orchestration python -m pip list cd $DRIVERS_TOOLS From 7be073fb76584df8353c974463878431c3a4e90e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 4 Sep 2024 14:26:27 -0500 Subject: [PATCH 5/5] update comment --- .evergreen/start-orchestration.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/start-orchestration.sh b/.evergreen/start-orchestration.sh index af313439..fe7ad3be 100755 --- a/.evergreen/start-orchestration.sh +++ b/.evergreen/start-orchestration.sh @@ -35,8 +35,8 @@ venvcreate "${PYTHON:?}" venv echo "Creating virtual environment 'venv'... done." # Install from github to get the latest mongo-orchestration, fall back on published wheel. -# The fallback was added to accommodate RHEL 7.0, whose version of glibc does not support the -# hatchling backend used by mongo-orchestration. +# The fallback was added to accommodate versions of Python 3 for which there is no compatible version +# of the hatchling backend used by mongo-orchestration. python -m pip install -q --upgrade 'https://github.com/mongodb/mongo-orchestration/archive/master.tar.gz' || python -m pip install -q --upgrade mongo-orchestration python -m pip list cd $DRIVERS_TOOLS