diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set.py index 1fa76f93b..6c428d975 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set.py @@ -59,9 +59,9 @@ def replica_set(namespace: str, custom_mdb_version: str, cluster_domain: str) -> "resources": { "limits": { "cpu": "1", - "memory": "1Gi", + "memory": "2Gi", }, - "requests": {"cpu": "0.2", "memory": "300M"}, + "requests": {"cpu": "0.5", "memory": "1Gi"}, }, } ] @@ -78,9 +78,9 @@ def replica_set(namespace: str, custom_mdb_version: str, cluster_domain: str) -> "resources": { "limits": { "cpu": "1", - "memory": "1Gi", + "memory": "2Gi", }, - "requests": {"cpu": "0.2", "memory": "300M"}, + "requests": {"cpu": "0.5", "memory": "1Gi"}, }, } ] @@ -188,9 +188,9 @@ def test_pods_resources(self): pod = self.corev1.read_namespaced_pod(podname, self.namespace) c0 = pod.spec.containers[0] assert c0.resources.limits["cpu"] == "1" - assert c0.resources.limits["memory"] == "1Gi" - assert c0.resources.requests["cpu"] == "200m" - assert c0.resources.requests["memory"] == "300M" + assert c0.resources.limits["memory"] == "2Gi" + assert c0.resources.requests["cpu"] == "500m" + assert c0.resources.requests["memory"] == "1Gi" def test_pods_container_envvars(self): for pod_name in self._get_pods("my-replica-set-{}", 3): diff --git a/scripts/dev/setup_ibm_container_runtime.sh b/scripts/dev/setup_ibm_container_runtime.sh index d7aa7f17b..afd544679 100755 --- a/scripts/dev/setup_ibm_container_runtime.sh +++ b/scripts/dev/setup_ibm_container_runtime.sh @@ -2,8 +2,14 @@ set -Eeou pipefail +echo "Cleaning DNF cache..." +sudo dnf clean all && sudo rm -r /var/cache/dnf + echo "Installing/upgrading crun..." -sudo dnf upgrade -y crun || sudo dnf install -y crun || sudo yum upgrade -y crun || sudo yum install -y crun +sudo dnf upgrade -y crun --disableplugin=subscription-manager || \ +sudo dnf install -y crun --disableplugin=subscription-manager || \ +sudo yum upgrade -y crun --disableplugin=subscription-manager || \ +sudo yum install -y crun --disableplugin=subscription-manager if ! crun --version &>/dev/null; then echo "❌ crun installation failed"