Skip to content

Commit 1796a5a

Browse files
committed
remove special minikube and venv setup
1 parent 6de29cb commit 1796a5a

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

.evergreen-functions.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,8 @@ functions:
295295
- command: subprocess.exec
296296
type: setup
297297
params:
298+
env:
299+
SKIP_MINIKUBE_SETUP: ${skip_minikube_setup|false}
298300
working_dir: src/github.com/mongodb/mongodb-kubernetes
299301
add_to_path:
300302
- ${workdir}/bin

.evergreen.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,8 @@ tasks:
395395
commands:
396396
- func: clone
397397
- func: setup_building_host_minikube
398+
vars:
399+
skip_minikube_setup: true # we skip minikube setup as we just build and push an image
398400
- func: download_multi_cluster_binary
399401
vars:
400402
platform: linux/s390x
@@ -406,6 +408,8 @@ tasks:
406408
commands:
407409
- func: clone
408410
- func: setup_building_host_minikube
411+
vars:
412+
skip_minikube_setup: true # we skip minikube setup as we just build and push an image
409413
- func: download_multi_cluster_binary
410414
vars:
411415
platform: linux/ppc64le
@@ -1481,8 +1485,6 @@ buildvariants:
14811485
variant: init_test_run
14821486
- name: build_init_database_image_ubi
14831487
variant: init_test_run
1484-
- name: build_database_image_ubi
1485-
variant: init_test_run
14861488
- name: build_test_image_ibm_power
14871489
variant: init_test_run_ibm_power
14881490
- name: publish_helm_chart

scripts/dev/setup_ibm_container_runtime.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ mkdir -p ~/.config/containers
3838
cat > ~/.config/containers/containers.conf << 'EOF'
3939
[containers]
4040
cgroup_manager = "cgroupfs"
41+
42+
[network]
43+
# Use slirp4netns instead of pasta for rootless networking
44+
# pasta requires D-Bus session which isn't available in Evergreen
45+
default_rootless_network_cmd = "slirp4netns"
4146
EOF
4247

4348
cat > ~/.config/containers/storage.conf << EOF

scripts/minikube/setup_minikube.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,11 @@ start_minikube_cluster() {
141141
echo "Ensuring clean minikube state..."
142142
"${PROJECT_DIR:-.}/bin/minikube" delete 2>/dev/null || true
143143

144-
# Also clean up any orphaned podman containers from previous runs
145-
echo "Cleaning up orphaned containers..."
144+
# Also clean up any orphaned podman resources from previous runs
145+
echo "Cleaning up orphaned podman resources..."
146146
podman rm -f minikube 2>/dev/null || true
147+
podman volume rm -f minikube 2>/dev/null || true
148+
podman network rm -f minikube 2>/dev/null || true
147149
podman system prune -f 2>/dev/null || true
148150

149151
# Enable rootless mode - this tells minikube NOT to use sudo with podman

0 commit comments

Comments
 (0)