File tree Expand file tree Collapse file tree 4 files changed +9
-18
lines changed
Expand file tree Collapse file tree 4 files changed +9
-18
lines changed Original file line number Diff line number Diff line change @@ -295,9 +295,6 @@ functions:
295295 - command : subprocess.exec
296296 type : setup
297297 params :
298- env :
299- SKIP_MINIKUBE_SETUP : ${skip_minikube_setup!|false}
300- SKIP_INSTALL_REQUIREMENTS : ${skip_install_python_requirements!|true}
301298 working_dir : src/github.com/mongodb/mongodb-kubernetes
302299 add_to_path :
303300 - ${workdir}/bin
Original file line number Diff line number Diff line change @@ -395,9 +395,6 @@ tasks:
395395 commands :
396396 - func : clone
397397 - func : setup_building_host_minikube
398- vars :
399- skip_minikube_setup : true
400- skip_install_python_requirements : false
401398 - func : download_multi_cluster_binary
402399 vars :
403400 platform : linux/s390x
@@ -409,9 +406,6 @@ tasks:
409406 commands :
410407 - func : clone
411408 - func : setup_building_host_minikube
412- vars :
413- skip_minikube_setup : true
414- skip_install_python_requirements : false
415409 - func : download_multi_cluster_binary
416410 vars :
417411 platform : linux/ppc64le
Original file line number Diff line number Diff line change @@ -118,14 +118,8 @@ PYENV_VERSION="${PYTHON_VERSION}" python -m venv venv
118118source venv/bin/activate
119119pip install --upgrade pip
120120
121- skip_requirements=" ${SKIP_INSTALL_REQUIREMENTS:- false} "
122- if [[ " ${skip_requirements} " != " true" ]]; then
123- echo " Installing requirements.txt..."
124- pip install -r requirements.txt
125- else
126- echo " Skipping requirements.txt installation."
127- pip install requests
128- fi
121+ echo " Installing requirements.txt..."
122+ pip install -r requirements.txt
129123
130124echo " Python venv was recreated successfully."
131125echo " Using Python: $( which python) ($( python --version) )" >&2
Original file line number Diff line number Diff line change @@ -40,9 +40,15 @@ run_setup_step() {
4040
4141# Setup Python environment (needed for AWS CLI pip installation)
4242export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
43- export SKIP_INSTALL_REQUIREMENTS=${SKIP_INSTALL_REQUIREMENTS:- true}
4443run_setup_step " Python Virtual Environment" " scripts/dev/recreate_python_venv.sh"
4544
45+ # Activate the venv for subsequent commands in this script
46+ # (recreate_python_venv.sh activates it in a subshell, but that doesn't persist)
47+ if [[ -f " ${PROJECT_DIR} /venv/bin/activate" ]]; then
48+ echo " >>> Activating Python venv for remaining setup steps"
49+ source " ${PROJECT_DIR} /venv/bin/activate"
50+ fi
51+
4652run_setup_step " AWS CLI Setup" " scripts/evergreen/setup_aws.sh"
4753
4854run_setup_step " kubectl and helm Setup" " scripts/evergreen/setup_kubectl.sh"
You can’t perform that action at this time.
0 commit comments