Skip to content

Commit 3c34089

Browse files
add option to specify minikube memory (#170)
1 parent 4954479 commit 3c34089

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ pipeline {
213213
}
214214
steps {
215215
sh """
216-
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; make test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} kubernetesVersion=${params.K8_VERSION} saveOutput=true
216+
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; make test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} kubernetesVersion=${params.K8_VERSION} saveOutput=true minikubeMemory=20gb
217217
"""
218218
}
219219
}
@@ -223,7 +223,7 @@ pipeline {
223223
}
224224
steps {
225225
sh """
226-
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; make hc-test dockerImage=${dockerRepository}:${dockerVersion} kubernetesVersion=${params.K8_VERSION}
226+
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; make hc-test dockerImage=${dockerRepository}:${dockerVersion} kubernetesVersion=${params.K8_VERSION} minikubeMemory=20gb
227227
"""
228228
}
229229
}

makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
dockerImage?=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-centos:11.1.20230522-centos-1.0.2
22
prevDockerImage?=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-centos:10.0-20230522-centos-1.0.2
33
kubernetesVersion?=v1.25.8
4+
minikubeMemory?=10gb
45
## System requirement:
56
## - Go
67
## - gotestsum (if you want to enable saveOutput for testing commands)
@@ -90,7 +91,7 @@ e2e-test: prepare
9091
minikube delete
9192

9293
@echo "=====Installing minikube cluster"
93-
minikube start --driver=docker --kubernetes-version=$(kubernetesVersion) -n=1 --memory=16000mb --cpus=2
94+
minikube start --driver=docker --kubernetes-version=$(kubernetesVersion) -n=1 --memory=$(minikubeMemory) --cpus=2
9495

9596

9697
@echo "=====Loading marklogc image $(dockerImage) to minikube cluster"
@@ -116,7 +117,7 @@ hc-test:
116117
minikube delete
117118

118119
@echo "=====Installing minikube cluster"
119-
minikube start --driver=docker --kubernetes-version=$(kubernetesVersion) -n=1 --memory=16000mb --cpus=2
120+
minikube start --driver=docker --kubernetes-version=$(kubernetesVersion) -n=1 --memory=$(minikubeMemory) --cpus=2
120121

121122

122123
@echo "=====Loading marklogc image $(dockerImage) to minikube cluster"

0 commit comments

Comments
 (0)