@@ -35,6 +35,9 @@ void preBuildCheck() {
35
35
sh ' exit 1'
36
36
}
37
37
}
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"'
38
41
}
39
42
40
43
@NonCPS
@@ -130,17 +133,6 @@ void publishTestResults() {
130
133
archiveArtifacts artifacts : ' **/test/test_results/*.xml' , allowEmptyArchive : true
131
134
}
132
135
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
-
144
136
String getVersionDiv (mlVersion ) {
145
137
switch (mlVersion) {
146
138
case ' 10.0' :
@@ -195,12 +187,6 @@ pipeline {
195
187
}
196
188
}
197
189
198
- stage(' Pull-Image' ) {
199
- steps {
200
- pullImage()
201
- }
202
- }
203
-
204
190
stage(' Lint' ) {
205
191
steps {
206
192
lint()
@@ -213,7 +199,7 @@ pipeline {
213
199
}
214
200
steps {
215
201
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
217
203
"""
218
204
}
219
205
}
@@ -223,7 +209,7 @@ pipeline {
223
209
}
224
210
steps {
225
211
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
227
213
"""
228
214
}
229
215
}
@@ -233,10 +219,11 @@ pipeline {
233
219
always {
234
220
publishTestResults()
235
221
sh '''
222
+ export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; export GOPATH=/space/go; minikube delete --all --purge
236
223
docker system prune --force --filter "until=720h"
237
224
docker volume prune --force
238
225
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
240
227
'''
241
228
sh " rm -rf $WORKSPACE /test/test_results/"
242
229
}
0 commit comments