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
diff --git a/jjb/verify/voltha-bbsim.yaml b/jjb/verify/voltha-bbsim.yaml
index 00a2d59..c947e9b 100644
--- a/jjb/verify/voltha-bbsim.yaml
+++ b/jjb/verify/voltha-bbsim.yaml
@@ -23,7 +23,6 @@
junit-allow-empty-results: true
build-node: 'ubuntu16.04-basebuild-1c-2g'
- 'voltha-patch-test':
- buildImages: true
pipeline: 'voltha-bbsim-tests.groovy'
- job-group:
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 1cfea15..f7fa935 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -18,6 +18,8 @@
- 'tag-collision-reject':
dependency-jobs: 'verify_voltha-go_licensed'
- 'make-unit-test':
+ build-node: 'ubuntu16.04-basebuild-2c-4g'
+ build-timeout: 20
dest-gopath: "github.com/opencord"
name-extension: "-lint"
unit-test-targets: 'lint'
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index e8c8b7c..86092ac 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -19,6 +19,5 @@
dependency-jobs: 'verify_voltha-helm-charts_tag-collision'
- 'voltha-patch-test':
build-timeout: 20
- buildImages: false
pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 64be69c..1878259 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -10,8 +10,6 @@
branch-regexp: '{all-branches-regexp}'
- 'publish-voltha-openolt-adapter-jobs':
branch-regexp: '{all-branches-regexp}'
- - 'voltha-openolt-adapter-system-tests':
- branch-regexp: '{voltha-stablization-branch}'
- job-group:
name: 'verify-voltha-openolt-adapter-jobs'
@@ -32,6 +30,8 @@
unit-test-targets: 'test'
unit-test-keep-going: 'true'
junit-allow-empty-results: true
+ - 'voltha-patch-test':
+ pipeline: 'voltha-bbsim-tests.groovy'
- job-group:
name: 'publish-voltha-openolt-adapter-jobs'
@@ -40,10 +40,3 @@
build-timeout: 30
docker-repo: 'voltha'
dependency-jobs: 'version-tag'
-
-- job-group:
- name: 'voltha-openolt-adapter-system-tests'
- jobs:
- - 'voltha-patch-test':
- buildImages: true
- pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/verify/voltha-openonu-adapter.yaml b/jjb/verify/voltha-openonu-adapter.yaml
index e504dfa..903e2b6 100644
--- a/jjb/verify/voltha-openonu-adapter.yaml
+++ b/jjb/verify/voltha-openonu-adapter.yaml
@@ -10,8 +10,6 @@
branch-regexp: '{all-branches-regexp}'
- 'publish-voltha-openonu-adapter-jobs':
branch-regexp: '{all-branches-regexp}'
- - 'voltha-openonu-adapter-system-tests':
- branch-regexp: '{voltha-stablization-branch}'
- job-group:
name: 'verify-voltha-openonu-adapter-jobs'
@@ -24,6 +22,8 @@
unit-test-keep-going: 'true'
junit-allow-empty-results: true
build-timeout: 15
+ - 'voltha-patch-test':
+ pipeline: 'voltha-bbsim-tests.groovy'
- job-group:
name: 'publish-voltha-openonu-adapter-jobs'
@@ -32,10 +32,3 @@
build-timeout: 30
docker-repo: 'voltha'
dependency-jobs: 'version-tag'
-
-- job-group:
- name: 'voltha-openonu-adapter-system-tests'
- jobs:
- - 'voltha-patch-test':
- buildImages: true
- pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 253ad0c..34e39c9 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -205,11 +205,6 @@
default: '-e notready'
description: 'test tags'
- - bool:
- name: buildImages
- default: {buildImages}
- description: 'Build modified voltha components'
-
project-type: pipeline
concurrent: true