Skip to content

Commit d36f392

Browse files
committed
linter, reordering minkube, fix agents, fix venv, fix python run path
1 parent 009bea5 commit d36f392

File tree

5 files changed

+21
-15
lines changed

5 files changed

+21
-15
lines changed

.evergreen-functions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ functions:
352352
shell: bash
353353
working_dir: src/github.com/mongodb/mongodb-kubernetes
354354
script: |
355-
scripts/evergreen/run_python.sh scripts/evergreen/e2e/setup_cloud_qa.py create
355+
scripts/dev/run_python.sh scripts/evergreen/e2e/setup_cloud_qa.py create
356356
# The additional switch is needed, since we now have created the needed OM exports.
357357
- *switch_context
358358

@@ -363,7 +363,7 @@ functions:
363363
shell: bash
364364
working_dir: src/github.com/mongodb/mongodb-kubernetes
365365
script: |
366-
scripts/evergreen/run_python.sh scripts/evergreen/e2e/setup_cloud_qa.py delete
366+
scripts/dev/run_python.sh scripts/evergreen/e2e/setup_cloud_qa.py delete
367367
368368
dump_diagnostic_information_from_all_namespaces:
369369
- command: subprocess.exec

.evergreen.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,15 @@ tasks:
435435
- name: build_test_image_ibm
436436
commands:
437437
- func: clone
438-
- func: python_venv
439-
- func: setup_aws
440-
- func: download_kube_tools
438+
- command: subprocess.exec
439+
type: setup
440+
params:
441+
env:
442+
SKIP_MINIKUBE_SETUP: "true"
443+
working_dir: src/github.com/mongodb/mongodb-kubernetes
444+
add_to_path:
445+
- ${workdir}/bin
446+
command: scripts/evergreen/setup_minikube_host.sh
441447
- func: build_multi_cluster_binary
442448
- func: build_test_image_ibm
443449

build_info.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,18 +160,14 @@
160160
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests",
161161
"platforms": [
162162
"linux/arm64",
163-
"linux/amd64",
164-
"linux/s390x",
165-
"linux/ppc64le"
163+
"linux/amd64"
166164
]
167165
},
168166
"staging": {
169167
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests",
170168
"platforms": [
171169
"linux/arm64",
172-
"linux/amd64",
173-
"linux/s390x",
174-
"linux/ppc64le"
170+
"linux/amd64"
175171
]
176172
}
177173
},

scripts/dev/recreate_python_venv.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ install_pyenv() {
1212
echo "pyenv directory already exists, setting up environment..." >&2
1313
export PYENV_ROOT="${HOME}/.pyenv"
1414
export PATH="${PYENV_ROOT}/bin:${PATH}"
15-
15+
1616
# Initialize pyenv in current shell
1717
if command -v pyenv &> /dev/null; then
1818
eval "$(pyenv init --path)"
@@ -24,7 +24,7 @@ install_pyenv() {
2424
rm -rf "${HOME}/.pyenv"
2525
fi
2626
fi
27-
27+
2828
# Check if pyenv command is available in PATH
2929
if command -v pyenv &> /dev/null; then
3030
echo "pyenv already available in PATH" >&2

scripts/evergreen/setup_minikube_host.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ run_setup_step() {
3939
}
4040

4141
# Setup Python environment (needed for AWS CLI pip installation)
42+
export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
4243
export SKIP_INSTALL_REQUIREMENTS=true
4344
run_setup_step "Python Virtual Environment" "scripts/dev/recreate_python_venv.sh"
4445

@@ -48,8 +49,11 @@ run_setup_step "kubectl and helm Setup" "scripts/evergreen/setup_kubectl.sh"
4849

4950
run_setup_step "jq Setup" "scripts/evergreen/setup_jq.sh"
5051

51-
run_setup_step "Minikube Host Setup with Container Runtime Detection" "scripts/minikube/setup_minikube_host.sh"
52-
52+
if [[ "${SKIP_MINIKUBE_SETUP:-}" != "true" ]]; then
53+
run_setup_step "Minikube Host Setup with Container Runtime Detection" "scripts/minikube/setup_minikube_host.sh"
54+
else
55+
echo "⏭️ Skipping Minikube setup as SKIP_MINIKUBE_SETUP=true"
56+
fi
5357
export CONTAINER_RUNTIME=podman
5458
run_setup_step "Container Registry Authentication" "scripts/dev/configure_container_auth.sh"
5559

0 commit comments

Comments
 (0)