Skip to content

Commit 5b01dc8

Browse files
Merge pull request #293 from vitalykorolev/MLE-17127_update-versions
MLE-17127 Update k8s versions
2 parents 242ff81 + 81cc576 commit 5b01dc8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ pipeline {
173173
dockerRegistry = 'ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com'
174174
dockerRepository = "${dockerRegistry}/marklogic/marklogic-server-${params.dockerImageType}"
175175
PATH = "/space/go/bin:${env.PATH}"
176-
MINIKUBE_HOME = "/space"
176+
MINIKUBE_HOME = "/space/minikube/"
177177
KUBECONFIG = "/space/.kube-config"
178178
GOPATH = "/space/go"
179179
}
@@ -182,7 +182,7 @@ pipeline {
182182
choice(name: 'dockerImageType', choices: 'ubi-rootless\nubi\ncentos', description: 'Platform type for Docker image')
183183
string(name: 'dockerVersion', defaultValue: 'latest-11', description: 'Docker tag to use for tests. (e.g. 11.2.nightly-ubi-rootless-1.1.2) Has to correspond with dockerImageType.', trim: true)
184184
string(name: 'prevDockerVersion', defaultValue: 'latest-10', description: 'Previous Docker version for MarkLogic upgrade tests. (e.g. 10.0-10.2-centos-1.1.2) Has to correspond with dockerImageType.', trim: true)
185-
choice(name: 'K8_VERSION', choices: 'v1.29.6\nv1.30.2\nv1.28.11\nv1.27.15\nv1.26.15\nv1.25.16', description: 'Test Kubernetes version.')
185+
choice(name: 'K8_VERSION', choices: 'v1.30.5\nv1.31.1\nv1.29.9\nv1.28.14\nv1.27.15\nv1.26.15\nv1.25.16', description: 'Test Kubernetes version.')
186186
booleanParam(name: 'KUBERNETES_TESTS', defaultValue: true, description: 'Run kubernetes tests')
187187
string(name: 'KUBERNETES_TEST_SELECTION', defaultValue: '...', description: 'Pick one test to run. (e.g. tls_test.go) ... will run all tests.', trim: true)
188188
booleanParam(name: 'HC_TESTS', defaultValue: false, description: 'Run Hub Central E2E UI tests (takes about 3 hours)')
@@ -256,7 +256,7 @@ pipeline {
256256
docker system prune --force --all
257257
docker volume prune --force --all
258258
docker system df
259-
sudo rm -rf /space/.minikube /space/go /space/.kube-config
259+
sudo rm -rf /space/minikube/ /space/go /space/.kube-config
260260
'''
261261
sh "rm -rf $WORKSPACE/test/test_results/"
262262
}

0 commit comments

Comments
 (0)