added changes in jenkins and make file to support upgrade tests

Author: Barkha Choithani

Jenkinsfile

@@ -135,6 +135,8 @@ void pullImage() {
         sh """
             echo "\$docker_password" | docker login --username \$docker_user --password-stdin ${dockerRegistry}
             docker pull ${dockerRepository}:${dockerVersion}
+            docker pull ${dockerRepository}:${dockerVersion}
+            docker pull ${dockerRepository}:${prevDockerVersion}
         """
     }
 }
@@ -170,13 +172,16 @@ pipeline {
         dockerRepository = "${dockerRegistry}/marklogic/marklogic-server-centos"
         dockerVerDivider = getVersionDiv(params.ML_VERSION)
         dockerVersion = "${ML_VERSION}${dockerVerDivider}${timeStamp}-centos-${dockerReleaseVer}"
+        prevDockerVersion = "${PREV_ML_VERSION}${dockerVerDivider}${timeStamp}-centos-${prevDockerReleaseVer}"
     }
 
     parameters {
         string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
         choice(name: 'ML_VERSION', choices: '11.0\n12.0\n10.0\n9.0', description: 'MarkLogic version. used to pick appropriate docker image')
         booleanParam(name: 'KUBERNETES_TESTS', defaultValue: true, description: 'Run kubernetes tests')
         string(name: 'dockerReleaseVer', defaultValue: '1.0.1', description: 'Current Docker version. (e.g. 1.0.1)', trim: true)
+        choice(name: 'PREV_ML_VERSION', choices: '10.0\n9.0', description: 'Previous MarkLogic version for MarkLogic upgrade tests')
+        string(name: 'prevDockerReleaseVer', defaultValue: '1.0.1', description: 'Previous Docker version for MarkLogic upgrade tests. (e.g. 1.0.1)', trim: true)
     }
 
     stages {
@@ -205,7 +210,7 @@ pipeline {
             steps {
                 sh """
                     export MINIKUBE_HOME=/space;
-                    make test dockerImage=${dockerRepository}:${dockerVersion} saveOutput=true
+                    make test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} saveOutput=true
                 """
             }
         }

makefile

@@ -1,5 +1,5 @@
-dockerImage?=marklogic-centos/marklogic-server-centos:10-internal
-
+dockerImage?=ml-docker-dev.marklogic.com/marklogic/marklogic-server-centos:11.0.20230307-centos-1.0.2
+prevDockerImage?=ml-docker-dev.marklogic.com/marklogic/marklogic-server-centos:10.0-20230307-centos-1.0.2
 ## System requirement:
 ## - Go 
 ## 		- gotestsum (if you want to enable saveOutput for testing commands)
@@ -80,6 +80,7 @@ lint:
 ## Run all end to end tests
 ## Options:
 ## * [dockerImage] optional. default is marklogicdb/marklogic-db:latest. Example: dockerImage=marklogic-centos/marklogic-server-centos:10-internal
+## * [prevDockerImage] optional. used for marklogic upgrade tests 
 ## * [saveOutput] optional. Save the output to a xml file. Example: saveOutput=true
 .PHONY: e2e-test
  e2e-test: prepare
@@ -92,6 +93,9 @@ lint:
 	@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 "=====Running e2e tests"
 	$(if $(saveOutput),gotestsum --junitfile test/test_results/e2e-tests.xml ./test/e2e/... -count=1 -timeout 30m, go test -v -count=1 -timeout 30m ./test/e2e/...) 
 

test/e2e/upgrade_test.go

@@ -29,12 +29,12 @@ func TestHelmUpgrade(t *testing.T) {
 	imageTag, tagPres := os.LookupEnv("dockerVersion")
 
 	if !repoPres {
-		imageRepo = "marklogic-centos/marklogic-server-centos"
+		imageRepo = "ml-docker-dev.marklogic.com/marklogic/marklogic-server-centos"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 
 	if !tagPres {
-		imageTag = "10-internal"
+		imageTag = "11.0.20230307-centos-1.0.2"
 		t.Logf("No imageTag variable present, setting to default value: " + imageTag)
 	}
 
@@ -116,6 +116,23 @@ func TestMLupgrade(t *testing.T) {
 	if e != nil {
 		t.Fatalf(e.Error())
 	}
+	imageRepo, repoPres := os.LookupEnv("dockerRepository")
+	imageTag, tagPres := os.LookupEnv("dockerVersion")
+	prevImageTag, prevTagPres := os.LookupEnv("dockerVersion")
+
+	if !repoPres {
+		imageRepo = "ml-docker-dev.marklogic.com/marklogic/marklogic-server-centos"
+		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
+	}
+	if !tagPres {
+		imageTag = "11.0.20230307-centos-1.0.2"
+		t.Logf("No imageTag variable present, setting to default value: " + imageTag)
+	}
+	if !prevTagPres {
+		prevImageTag = "10.0-20230307-centos-1.0.2"
+		t.Logf("No imageTag variable present, setting to default value: " + prevImageTag)
+	}
+
 	username := "admin"
 	password := "admin"
 
@@ -127,8 +144,8 @@ func TestMLupgrade(t *testing.T) {
 			"persistence.enabled": "false",
 			"replicaCount":        "1",
 			"updateStrategy.type": "OnDelete",
-			"image.repository":    "ml-docker-dev.marklogic.com/marklogic/marklogic-server-centos",
-			"image.tag":           "10.0-20230307-centos-1.0.2",
+			"image.repository":    imageRepo,
+			"image.tag":           prevImageTag,
 			"auth.adminUsername":  username,
 			"auth.adminPassword":  password,
 		},
@@ -148,12 +165,14 @@ func TestMLupgrade(t *testing.T) {
 	// wait until second pod is in Ready status
 	k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 20, 20*time.Second)
 
+	k8s.RunKubectl(t, kubectlOptions, "describe", "pod", podName)
+
 	newOptions := &helm.Options{
 		KubectlOptions: kubectlOptions,
 		SetValues: map[string]string{
 			"persistence.enabled":   "false",
-			"image.repository":      "ml-docker-dev.marklogic.com/marklogic/marklogic-server-centos",
-			"image.tag":             "11.0.20230307-centos-1.0.2",
+			"image.repository":      imageRepo,
+			"image.tag":             imageTag,
 			"logCollection.enabled": "false",
 		},
 	}
@@ -189,6 +208,6 @@ func TestMLupgrade(t *testing.T) {
 	mlVersion := gjson.Get(string(body), `local-cluster-default.version`)
 
 	// verify latest MarkLogic version after upgrade
-	assert.Equal(t, mlVersion.Str, "11.0.0")
+	assert.Equal(t, mlVersion.Str, imageTag)
 
 }