Skip to content

Commit a6df526

Browse files
sumanthravipatiSumanth Ravipati
authored andcommitted
CLD-728: Changes to test K8 version compatibility
Co-authored-by: Sumanth Ravipati <[email protected]>
1 parent 7754377 commit a6df526

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ pipeline {
183183
string(name: 'dockerReleaseVer', defaultValue: '1.0.2', description: 'Current Docker version. (e.g. 1.0.1)', trim: true)
184184
choice(name: 'PREV_ML_VERSION', choices: '10.0\n9.0', description: 'Previous MarkLogic version for MarkLogic upgrade tests')
185185
string(name: 'prevDockerReleaseVer', defaultValue: '1.0.2', description: 'Previous Docker version for MarkLogic upgrade tests. (e.g. 1.0.1)', trim: true)
186+
choice(name: 'K8_VERSION', choices: 'v1.25.8\nv1.26.3\nv1.24.12\nv1.23.17', description: 'Test Kubernetes version. (e.g. v1.25.8)')
186187
}
187188

188189
stages {
@@ -211,7 +212,7 @@ pipeline {
211212
steps {
212213
sh """
213214
export MINIKUBE_HOME=/space;
214-
make test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} saveOutput=true
215+
make test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} kubernetesVersion=${params.K8_VERSION} saveOutput=true
215216
"""
216217
}
217218
}

makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
dockerImage?=ml-docker-dev.marklogic.com/marklogic/marklogic-server-centos:11.0.20230307-centos-1.0.2
22
prevDockerImage?=ml-docker-dev.marklogic.com/marklogic/marklogic-server-centos:10.0-20230307-centos-1.0.2
3+
kubernetesVersion?=v1.25.8
34
## System requirement:
45
## - Go
56
## - gotestsum (if you want to enable saveOutput for testing commands)
@@ -80,15 +81,16 @@ lint:
8081
## Run all end to end tests
8182
## Options:
8283
## * [dockerImage] optional. default is marklogicdb/marklogic-db:latest. Example: dockerImage=marklogic-centos/marklogic-server-centos:10-internal
83-
## * [prevDockerImage] optional. used for marklogic upgrade tests
84+
## * [prevDockerImage] optional. used for marklogic upgrade tests
85+
## * [kubernetesVersion] optional. Default is v1.25.8. Used for testing kubernetes version compatibility
8486
## * [saveOutput] optional. Save the output to a xml file. Example: saveOutput=true
8587
.PHONY: e2e-test
8688
e2e-test: prepare
8789
@echo "=====Delete if there are existing minikube cluster"
8890
minikube delete
8991

9092
@echo "=====Installing minikube cluster"
91-
minikube start --driver=docker -n=1 --cpus 2 --memory 10000
93+
minikube start --driver=docker --kubernetes-version=$(kubernetesVersion) -n=1 --cpus 2 --memory 10000
9294

9395
@echo "=====Loading marklogc image $(dockerImage) to minikube cluster"
9496
minikube image load $(dockerImage)
@@ -118,6 +120,7 @@ template-test: prepare
118120
## Run all tests
119121
## Options:
120122
## * [dockerImage] optional. default is marklogicdb/marklogic-db:latest. Example: dockerImage=marklogic-centos/marklogic-server-centos:10-internal
123+
## * [kubernetesVersion] optional. Default is v1.25.8. Used for testing kubernetes version compatibility
121124
## * [saveOutput] optional. Save the output to a xml file. Example: saveOutput=true
122125
.PHONY: test
123126
test: template-test e2e-test

0 commit comments

Comments
 (0)