Skip to content

Commit 46962f5

Browse files
author
Peng Zhou
committed
update marklogic image version
1 parent 60aa994 commit 46962f5

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

Makefile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ VERIFY_HUGE_PAGES ?= false
1111
export E2E_DOCKER_IMAGE ?= $(IMG)
1212
export E2E_KUSTOMIZE_VERSION ?= $(KUSTOMIZE_VERSION)
1313
export E2E_CONTROLLER_TOOLS_VERSION ?= $(CONTROLLER_TOOLS_VERSION)
14-
export E2E_MARKLOGIC_IMAGE_VERSION ?= progressofficial/marklogic-db:11.3.1-ubi-rootless-2.1.0
14+
export E2E_MARKLOGIC_IMAGE_VERSION ?= progressofficial/marklogic-db:11.3.1-ubi-rootless-2.1.3
1515
export E2E_KUBERNETES_VERSION ?= v1.31.0
1616

1717
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
@@ -134,22 +134,23 @@ test: manifests generate fmt vet envtest ## Run tests.
134134
e2e-test:
135135
@echo "=====Check Huges pages test is enabled or not for e2e test"
136136
ifeq ($(VERIFY_HUGE_PAGES), true)
137-
@echo "=====Setting hugepages value to 1280 for hugepages-e2e test"
138-
sudo sysctl -w vm.nr_hugepages=1280
137+
# @echo "=====Setting hugepages value to 1280 for hugepages-e2e test"
138+
# sudo sysctl -w vm.nr_hugepages=1280
139139

140-
@echo "=====Restart minikube cluster to apply hugepages value"
141-
minikube stop
142-
minikube start
140+
# @echo "=====Restart minikube cluster to apply hugepages value"
141+
# minikube stop
142+
# minikube start
143143

144144
@echo "=====Running e2e test including hugepages test"
145-
go test -v -count=1 -timeout 30m ./test/e2e -verifyHugePages
145+
# go test -v -count=1 -timeout 30m ./test/e2e -verifyHugePages
146+
go test -v -count=1 -timeout 30m ./test/e2e -args --labels="type=cluster-test"
146147

147-
@echo "=====Resetting hugepages value to 0"
148-
sudo sysctl -w vm.nr_hugepages=0
148+
# @echo "=====Resetting hugepages value to 0"
149+
# sudo sysctl -w vm.nr_hugepages=0
149150

150-
@echo "=====Restart minikube cluster"
151-
minikube stop
152-
minikube start
151+
# @echo "=====Restart minikube cluster"
152+
# minikube stop
153+
# minikube start
153154
else
154155
@echo "=====Running e2e test without hugepages test"
155156
go test -v -count=1 -timeout 30m ./test/e2e
@@ -162,6 +163,7 @@ e2e-setup-minikube: kustomize controller-gen build docker-build
162163
minikube start --driver=docker --kubernetes-version=$(E2E_KUBERNETES_VERSION) --memory=8192 --cpus=2
163164
minikube addons enable ingress
164165
minikube image load $(IMG)
166+
minikube image load $(E2E_MARKLOGIC_IMAGE_VERSION)
165167

166168
.PHONY: e2e-cleanup-minikube
167169
e2e-cleanup-minikube:

0 commit comments

Comments
 (0)