Merge pull request #286 from vitalykorolev/MLE-15676_pipeline-fix2

MLE-15676 pipeline fix2

Author: vitalykorolev

Jenkinsfile

@@ -44,7 +44,8 @@ void preBuildCheck() {
     sh '''
         curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b /space/go/bin v1.50.0
         wget https://github.com/gotestyourself/gotestsum/releases/download/v1.12.0/gotestsum_1.12.0_linux_amd64.tar.gz -O gotestsum.tar.gz
-        tar -xf gotestsum.tar.gz -C /space/go/bin/ gotestsum
+        mkdir -p /space/go/bin/
+        tar -xf gotestsum.tar.gz -C /space/go/bin/
     '''
 }
 
@@ -165,7 +166,8 @@ pipeline {
         skipStagesAfterUnstable()
     }
     triggers {
-        parameterizedCron( env.BRANCH_NAME == 'develop' ? '''00 04 * * * % IMAGE_SCAN=true;HELM_UPGRADE_TESTS=true;HC_TESTS=true''' : '')
+        parameterizedCron( env.BRANCH_NAME == 'develop' ? '''00 04 * * * % IMAGE_SCAN=true;HELM_UPGRADE_TESTS=true;HC_TESTS=true
+                                                             00 04 * * * % dockerImageType=ubi''' : '')
     }
     environment {
         dockerRegistry = 'ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com'

makefile

@@ -2,6 +2,7 @@ dockerImage?=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/mar
 prevDockerImage?=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-centos:10.0-20230522-centos-1.0.2
 kubernetesVersion?=v1.25.8
 minikubeMemory?=10gb
+testSelection?=...
 ## System requirement:
 ## - Go 
 ## 		- gotestsum (if you want to enable output saving for testing commands)
@@ -94,27 +95,31 @@ e2e-test: prepare
 	@echo "=====Installing minikube cluster"
 	minikube start --driver=docker --kubernetes-version=$(kubernetesVersion) -n=1 --memory=$(minikubeMemory) --cpus=2
 
-	@echo "=====Loading marklogc image $(dockerImage) to minikube cluster"
-	minikube image load $(dockerImage)
-
-	@echo "=====Loading marklogc image $(prevDockerImage) to minikube cluster"
-	minikube image load $(prevDockerImage)
-
 	@echo "=====Pull $(dockerImage) image for upgrade test"
+	## This is only needed while we use minikube since the image is not accessible to go at runtime
 	docker pull $(dockerImage)
 
+	# Get env details for debugging
 	kubectl get nodes
 	kubectl -n kube-system get pods
 	minikube version
 	kubectl version
 	go version
 	docker version
 
+	# Update security context in values for ubi image
+ifneq ($(findstring rootless,$(dockerImage)),rootless)
+	echo "=Updating security context in values for root image."
+	sed -i 's/allowPrivilegeEscalation: false/allowPrivilegeEscalation: true/' charts/values.yaml
+else
+	echo "=Security context is not changed for rootless image."
+endif
+
 	@echo "=====Setting hugepages values to 0 for e2e tests"
 	sudo sysctl -w vm.nr_hugepages=0
 
 	@echo "=====Running e2e tests"
-	$(if $(saveOutput),gotestsum --junitfile test/test_results/e2e-tests.xml ./test/e2e/$(testSelection) -count=1 -timeout 180m, go test -v -count=1 -timeout 180m ./test/e2e/...)
+	$(if $(saveOutput),gotestsum --junitfile test/test_results/e2e-tests.xml ./test/e2e/$(testSelection) -count=1 -timeout 180m, go test -v -count=1 -timeout 180m ./test/e2e/$(testSelection))
 
 	@echo "=====Setting hugepages value to 1280 for hugepages-e2e test"
 	sudo sysctl -w vm.nr_hugepages=1280
@@ -131,7 +136,6 @@ e2e-test: prepare
 
 	@echo "=====Delete minikube cluster"
 	minikube delete
-	docker image rm $(dockerImage)
 
 #***************************************************************************
 # hc-test
@@ -146,13 +150,23 @@ hc-test:
 	@echo "=====Installing minikube cluster"
 	minikube start --driver=docker --kubernetes-version=$(kubernetesVersion) -n=1 --memory=$(minikubeMemory) --cpus=2
 
-	@echo "=====Loading marklogc image $(dockerImage) to minikube cluster"
-	minikube image load $(dockerImage)
-
 	@echo "=====Deploy helm with a single MarkLogic node"
 	helm install hc charts --set auth.adminUsername=admin --set auth.adminPassword=admin --set persistence.enabled=false --wait
 	kubectl wait -l statefulset.kubernetes.io/pod-name=hc-0 --for=condition=ready pod --timeout=30m
 
+	# Get env details for debugging
+	kubectl get nodes
+	kubectl -n kube-system get pods
+	minikube version
+	kubectl version
+	go version
+	docker version
+
+	# Update security context in values for rootless image
+ifeq ($(findstring rootless,$(dockerImage)),rootless)
+	sed -i 's/allowPrivilegeEscalation: true/allowPrivilegeEscalation: false/' charts/values.yaml
+endif
+
 	@echo "=====Clone Data Hub repository"
 	rm -rf marklogic-data-hub; git clone https://github.com/marklogic/marklogic-data-hub
 

test/e2e/upgrade_test.go

@@ -32,12 +32,12 @@ func TestHelmUpgrade(t *testing.T) {
 	imageTag, tagPres := os.LookupEnv("dockerVersion")
 
 	if !repoPres {
-		imageRepo = "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-centos"
+		imageRepo = "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 
 	if !tagPres {
-		imageTag = "11.0.nightly-centos-1.0.2"
+		imageTag = "latest-11"
 		t.Logf("No imageTag variable present, setting to default value: " + imageTag)
 	}
 
@@ -76,8 +76,8 @@ func TestHelmUpgrade(t *testing.T) {
 		SetValues: map[string]string{
 			"persistence.enabled":   "true",
 			"replicaCount":          "2",
-			"image.repository":      "progressofficial/marklogic-db",
-			"image.tag":             "latest",
+			"image.repository":      imageRepo,
+			"image.tag":             imageTag,
 			"logCollection.enabled": "false",
 		},
 	}
@@ -164,15 +164,15 @@ func TestMLupgrade(t *testing.T) {
 	prevImageTag, prevTagPres := os.LookupEnv("dockerVersion")
 
 	if !repoPres {
-		imageRepo = "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-centos"
+		imageRepo = "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 	if !tagPres {
-		imageTag = "11.0.nightly-centos-1.0.2"
+		imageTag = "latest-11"
 		t.Logf("No imageTag variable present, setting to default value: " + imageTag)
 	}
 	if !prevTagPres {
-		prevImageTag = "10.0-nightly-centos-1.0.2"
+		prevImageTag = "latest-10"
 		t.Logf("No imageTag variable present, setting to default value: " + prevImageTag)
 	}
 

test/testUtil/ml_ready_check.go

@@ -17,7 +17,7 @@ func MLReadyCheck(t *testing.T, kubectlOpt *k8s.KubectlOptions, podName string,
 	tunnel7997 := k8s.NewTunnel(kubectlOpt, k8s.ResourceTypePod, podName, 7997, 7997)
 	defer tunnel7997.Close()
 	tunnel7997.ForwardPort(t)
-	endpoint7997 := fmt.Sprintf("http://%s/LATEST/healthcheck", tunnel7997.Endpoint())
+	endpoint7997 := fmt.Sprintf("http://%s/", tunnel7997.Endpoint())
 
 	// verify if 7997 health check endpoint returns 200
 	err := http_helper.HttpGetWithRetryWithCustomValidationE(