Skip to content

Commit 0b0f86b

Browse files
MLE-11779 fix cleanup and go context (#176)
* set explicit gopath * rearranch cleanup steps * test without pull image step * remove image pull step completely * add a more complete minikube cleanup * add bridge network fix * add mising sudo * remove unused pullimage function
1 parent 9b0f535 commit 0b0f86b

File tree

2 files changed

+10
-23
lines changed

2 files changed

+10
-23
lines changed

Jenkinsfile

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ void preBuildCheck() {
3535
sh 'exit 1'
3636
}
3737
}
38+
39+
// our VMs sometime disable bridge traffic. this should help to restore it.
40+
sh 'sudo sh -c "echo 1 > /proc/sys/net/bridge/bridge-nf-call-iptables"'
3841
}
3942

4043
@NonCPS
@@ -130,17 +133,6 @@ void publishTestResults() {
130133
archiveArtifacts artifacts: '**/test/test_results/*.xml', allowEmptyArchive: true
131134
}
132135

133-
void pullImage() {
134-
withCredentials([usernamePassword(credentialsId: 'builder-credentials-artifactory', passwordVariable: 'docker_password', usernameVariable: 'docker_user')]) {
135-
sh """
136-
echo "\$docker_password" | docker login --username \$docker_user --password-stdin ${dockerRegistry}
137-
docker pull ${dockerRepository}:${dockerVersion}
138-
docker pull ${dockerRepository}:${dockerVersion}
139-
docker pull ${dockerRepository}:${prevDockerVersion}
140-
"""
141-
}
142-
}
143-
144136
String getVersionDiv(mlVersion) {
145137
switch (mlVersion) {
146138
case '10.0':
@@ -195,12 +187,6 @@ pipeline {
195187
}
196188
}
197189

198-
stage('Pull-Image') {
199-
steps {
200-
pullImage()
201-
}
202-
}
203-
204190
stage('Lint') {
205191
steps {
206192
lint()
@@ -213,7 +199,7 @@ pipeline {
213199
}
214200
steps {
215201
sh """
216-
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; make test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} kubernetesVersion=${params.K8_VERSION} saveOutput=true minikubeMemory=20gb
202+
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
217203
"""
218204
}
219205
}
@@ -223,7 +209,7 @@ pipeline {
223209
}
224210
steps {
225211
sh """
226-
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; make hc-test dockerImage=${dockerRepository}:${dockerVersion} kubernetesVersion=${params.K8_VERSION} minikubeMemory=20gb
212+
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
227213
"""
228214
}
229215
}
@@ -233,10 +219,11 @@ pipeline {
233219
always {
234220
publishTestResults()
235221
sh '''
222+
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; export GOPATH=/space/go; minikube delete --all --purge
236223
docker system prune --force --filter "until=720h"
237224
docker volume prune --force
238225
docker image prune --force --all
239-
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; minikube delete --all --purge
226+
sudo rm -rf /space/.minikube /space/go /space/.kube-config
240227
'''
241228
sh "rm -rf $WORKSPACE/test/test_results/"
242229
}

makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ help:
5959
prepare:
6060
go mod tidy
6161

62+
6263
#***************************************************************************
6364
# lint
6465
#***************************************************************************
@@ -88,12 +89,11 @@ lint:
8889
.PHONY: e2e-test
8990
e2e-test: prepare
9091
@echo "=====Delete if there are existing minikube cluster"
91-
minikube delete
92+
minikube delete --all --purge
9293

9394
@echo "=====Installing minikube cluster"
9495
minikube start --driver=docker --kubernetes-version=$(kubernetesVersion) -n=1 --memory=$(minikubeMemory) --cpus=2
9596

96-
9797
@echo "=====Loading marklogc image $(dockerImage) to minikube cluster"
9898
minikube image load $(dockerImage)
9999

@@ -114,7 +114,7 @@ e2e-test: prepare
114114
hc-test:
115115

116116
@echo "=====Delete if there are existing minikube cluster"
117-
minikube delete
117+
minikube delete --all --purge
118118

119119
@echo "=====Installing minikube cluster"
120120
minikube start --driver=docker --kubernetes-version=$(kubernetesVersion) -n=1 --memory=$(minikubeMemory) --cpus=2

0 commit comments

Comments
 (0)