Skip to content

Commit f589e6e

Browse files
Merge pull request #283 from marklogic/MLE-14608_update-pipeline-versions
MLE-14608 Update K8s versions
2 parents a4579a1 + c1d6cdd commit f589e6e

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

Jenkinsfile

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ void preBuildCheck() {
3939

4040
// our VMs sometime disable bridge traffic. this should help to restore it.
4141
sh 'sudo sh -c "echo 1 > /proc/sys/net/bridge/bridge-nf-call-iptables"'
42+
43+
// install local version of golangci-lint and gotestsum
44+
sh '''
45+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b /space/go/bin v1.50.0
46+
wget https://github.com/gotestyourself/gotestsum/releases/download/v1.12.0/gotestsum_1.12.0_linux_amd64.tar.gz -O gotestsum.tar.gz
47+
tar -xf gotestsum.tar.gz -C /space/go/bin/ gotestsum
48+
'''
4249
}
4350

4451
@NonCPS
@@ -163,13 +170,17 @@ pipeline {
163170
environment {
164171
dockerRegistry = 'ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com'
165172
dockerRepository = "${dockerRegistry}/marklogic/marklogic-server-${params.dockerImageType}"
173+
PATH = "/space/go/bin:${env.PATH}"
174+
MINIKUBE_HOME = "/space"
175+
KUBECONFIG = "/space/.kube-config"
176+
GOPATH = "/space/go"
166177
}
167178

168179
parameters {
169180
choice(name: 'dockerImageType', choices: 'ubi-rootless\nubi\ncentos', description: 'Platform type for Docker image')
170181
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)
171182
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)
172-
choice(name: 'K8_VERSION', choices: 'v1.28.10\nv1.29.5\nv1.27.14\nv1.26.15\nv1.25.16\nv1.24.17', description: 'Test Kubernetes version.')
183+
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.')
173184
booleanParam(name: 'KUBERNETES_TESTS', defaultValue: true, description: 'Run kubernetes tests')
174185
string(name: 'KUBERNETES_TEST_SELECTION', defaultValue: '...', description: 'Pick one test to run. (e.g. tls_test.go) ... will run all tests.', trim: true)
175186
booleanParam(name: 'HC_TESTS', defaultValue: false, description: 'Run Hub Central E2E UI tests (takes about 3 hours)')
@@ -207,7 +218,7 @@ pipeline {
207218
}
208219
steps {
209220
sh """
210-
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; export GOPATH=/space/go; make test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} kubernetesVersion=${params.K8_VERSION} saveOutput=true minikubeMemory=20gb testSelection=${params.KUBERNETES_TEST_SELECTION}
221+
make test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} kubernetesVersion=${params.K8_VERSION} saveOutput=true minikubeMemory=20gb testSelection=${params.KUBERNETES_TEST_SELECTION}
211222
"""
212223
}
213224
}
@@ -217,7 +228,7 @@ pipeline {
217228
}
218229
steps {
219230
sh """
220-
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; export GOPATH=/space/go; export upgradeTest=true; export initialChartVersion=${params.InitialChartVersion}; make upgrade-test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} kubernetesVersion=${params.K8_VERSION} saveOutput=true minikubeMemory=20gb
231+
export upgradeTest=true; export initialChartVersion=${params.InitialChartVersion}; make upgrade-test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} kubernetesVersion=${params.K8_VERSION} saveOutput=true minikubeMemory=20gb
221232
"""
222233
}
223234
}
@@ -227,7 +238,7 @@ pipeline {
227238
}
228239
steps {
229240
sh """
230-
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; export GOPATH=/space/go; make hc-test dockerImage=${dockerRepository}:${dockerVersion} kubernetesVersion=${params.K8_VERSION} minikubeMemory=20gb
241+
make hc-test dockerImage=${dockerRepository}:${dockerVersion} kubernetesVersion=${params.K8_VERSION} minikubeMemory=20gb
231242
"""
232243
}
233244
}
@@ -238,7 +249,7 @@ pipeline {
238249
publishTestResults()
239250
sh '''
240251
sudo sysctl -w vm.nr_hugepages=0
241-
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; export GOPATH=/space/go; minikube delete --all --purge
252+
minikube delete --all --purge
242253
docker rm -f $(docker ps -a -q) || true
243254
docker system prune --force --filter "until=720h"
244255
docker volume prune --force

0 commit comments

Comments
 (0)