Remove superfluous job groups
Don't abort if errors during postprocessing
Increase RAM for voltha-go lint test
Change-Id: I19bda53c96200dea3d488c2fa181ab47c6d81441
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 0b951ba..8fa78d9 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -67,27 +67,30 @@
}
stage('Build Images') {
- when { expression { return params.buildImages } }
steps {
sh """
- cd $WORKSPACE/voltha/${gerritProject}/
- make DOCKER_REPOSITORY=voltha/ DOCKER_TAG=citest docker-build
+ if [ "${gerritProject}" != "voltha-helm-charts" ]; then
+ cd $WORKSPACE/voltha/${gerritProject}/
+ make DOCKER_REPOSITORY=voltha/ DOCKER_TAG=citest docker-build
+ fi
"""
}
}
stage('Push Images') {
- when { expression { return params.buildImages } }
steps {
sh '''
- export GOROOT=/usr/local/go
- export GOPATH=\$(pwd)
- export TYPE=minimal
- export KUBECONFIG="$(./bin/kind get kubeconfig-path --name="voltha-minimal")"
- export VOLTCONFIG="/home/jenkins/.volt/config-minimal"
- export PATH=/w/workspace/${gerritProject}_sanity-system-test/kind-voltha/bin:$PATH
- docker images | grep citest
- for image in \$(docker images -f "reference=*/*citest" --format "{{.Repository}}"); do echo "Pushing \$image to nodes"; kind load docker-image \$image:citest --name voltha-\$TYPE --nodes voltha-\$TYPE-worker,voltha-\$TYPE-worker2; done
+ if [ "${gerritProject}" != "voltha-helm-charts" ]; then
+
+ export GOROOT=/usr/local/go
+ export GOPATH=\$(pwd)
+ export TYPE=minimal
+ export KUBECONFIG="$(./bin/kind get kubeconfig-path --name="voltha-minimal")"
+ export VOLTCONFIG="/home/jenkins/.volt/config-minimal"
+ export PATH=/w/workspace/${gerritProject}_sanity-system-test/kind-voltha/bin:$PATH
+ docker images | grep citest
+ for image in \$(docker images -f "reference=*/*citest" --format "{{.Repository}}"); do echo "Pushing \$image to nodes"; kind load docker-image \$image:citest --name voltha-\$TYPE --nodes voltha-\$TYPE-worker,voltha-\$TYPE-worker2; done
+ fi
'''
}
}
@@ -150,6 +153,7 @@
post {
always {
sh '''
+ set +e
# copy robot logs
if [ -d RobotLogs ]; then rm -r RobotLogs; fi; mkdir RobotLogs
cp -r $WORKSPACE/voltha-system-tests/tests/sanity/*ml ./RobotLogs || true