address review

mongodb-labs · Aug 29, 2023 · 45ffc40 · 45ffc40
1 parent 53bbb6b
commit 45ffc40
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/.evergreen/auth_aws/activate-authawsvenv.sh b/.evergreen/auth_aws/activate-authawsvenv.sh
@@ -33,11 +33,12 @@ activate_authawsvenv() {
     # shellcheck source=.evergreen/find-python3.sh
     . ../find-python3.sh || return
 
-    echo "Creating virtual environment 'authawsvenv'..."
     echo "Finding Python3 binary..."
-    PYTHON="$(find_python3 2>/dev/null)"
+    PYTHON="$(find_python3 2>/dev/null)" || return
     echo "Finding Python3 binary... done."
-    venvcreate $PYTHON authawsvenv || return
+
+    echo "Creating virtual environment 'authawsvenv'..."
+    venvcreate "${PYTHON:?}" authawsvenv || return
 
     local packages=(
       "boto3~=1.26.0"

diff --git a/.evergreen/auth_oidc/activate-authoidcvenv.sh b/.evergreen/auth_oidc/activate-authoidcvenv.sh
@@ -33,11 +33,12 @@ activate_authoidcvenv() {
     # shellcheck source=.evergreen/find-python3.sh
     . ../find-python3.sh || return
 
-    echo "Creating virtual environment 'authoidcvenv'..."
     echo "Finding Python3 binary..."
-    PYTHON="$(find_python3 2>/dev/null)"
+    PYTHON="$(find_python3 2>/dev/null)" || return
     echo "Finding Python3 binary... done."
-    venvcreate $PYTHON authoidcvenv || return
+
+    echo "Creating virtual environment 'authoidcvenv'..."
+    venvcreate "${PYTHON:?}" authoidcvenv || return
 
     local packages=(
       "boto3~=1.19.0"

diff --git a/.evergreen/auth_oidc/azure/run-test.sh b/.evergreen/auth_oidc/azure/run-test.sh
@@ -11,6 +11,6 @@ git clone https://github.com/mongodb/mongo-python-driver
 pushd mongo-python-driver
 python setup.py install --no_ext
 popd
-pip install requests
+pip install -q requests
 python azure/test.py
-popd
+popd
diff --git a/.evergreen/csfle/activate-kmstlsvenv.sh b/.evergreen/csfle/activate-kmstlsvenv.sh
@@ -33,11 +33,11 @@ activate_kmstlsvenv() {
     # shellcheck source=.evergreen/find-python3.sh
     . ../find-python3.sh || return
 
-    echo "Creating virtual environment 'kmstlsvenv'..."
     echo "Finding Python3 binary..."
-    PYTHON="$(find_python3 2>/dev/null)"
+    PYTHON="$(find_python3 2>/dev/null)" || return
     echo "Finding Python3 binary... done."
-    venvcreate $PYTHON kmstlsvenv || return
+
+    venvcreate "${PYTHON:?}" kmstlsvenv || return
 
     local packages=(
       "boto3~=1.19.0"
@@ -69,7 +69,6 @@ activate_kmstlsvenv() {
         return "$ret"
       }
     fi
-    echo "Creating virtual environment 'kmstlsvenv'... done."
   fi
 }
 

diff --git a/.evergreen/ocsp/activate-ocspvenv.sh b/.evergreen/ocsp/activate-ocspvenv.sh
@@ -33,11 +33,12 @@ activate_ocspvenv() {
     # shellcheck source=.evergreen/find-python3.sh
     . ../find-python3.sh || return
 
-    echo "Creating virtual environment 'ocspvenv'..."
     echo "Finding Python3 binary..."
-    PYTHON="$(find_python3 2>/dev/null)"
+    PYTHON="$(find_python3 2>/dev/null)" || return
     echo "Finding Python3 binary... done."
-    venvcreate $PYTHON ocspvenv || return
+
+    echo "Creating virtual environment 'ocspvenv'..."
+    venvcreate "${PYTHON:?}" ocspvenv || return
 
     python -m pip install -q -r mock-ocsp-responder-requirements.txt || {
       local -r ret="$?"

diff --git a/.evergreen/start-orchestration.sh b/.evergreen/start-orchestration.sh
@@ -26,13 +26,15 @@ det_evergreen_dir="$(dirname "${BASH_SOURCE[0]}")"
 cd "$MONGO_ORCHESTRATION_HOME"
 
 echo "Finding Python3 binary..."
-PYTHON="$(find_python3 2>/dev/null)"
+PYTHON="$(find_python3 2>/dev/null)" || return
 echo "Finding Python3 binary... done."
 
-venvcreate "$PYTHON" venv
+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 --upgrade 'https://github.com/mongodb/mongo-orchestration/archive/master.tar.gz'
+python -m pip install -q --upgrade 'https://github.com/mongodb/mongo-orchestration/archive/master.tar.gz'
 python -m pip list
 cd -