Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit d1a5932

Browse files
author
Ian Campbell
committed
ci: more gracefully handle junit files which don't exist
Wrap the block in a `dir` to reduce the length of the filenames. Signed-off-by: Ian Campbell <[email protected]>
1 parent 83568ec commit d1a5932

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

Jenkinsfile

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,12 @@ pipeline {
123123
}
124124
post {
125125
always {
126-
sh 'sed -i -E -e \'s,"github.com/docker/app","unit/basic",g; s,"github.com/docker/app/([^"]*)","unit/basic/\\1",g\' src/github.com/docker/app/_build/test-results/unit-coverage.xml'
127-
sh 'sed -i -E -e \'s,"github.com/docker/app/e2e","e2e/basic",g\' src/github.com/docker/app/_build/test-results/e2e-coverage.xml'
128-
archiveArtifacts 'src/github.com/docker/app/_build/test-results/*.xml'
129-
junit 'src/github.com/docker/app/_build/test-results/*.xml'
126+
dir('src/github.com/docker/app/_build/test-results') {
127+
sh '[ ! -e unit-coverage.xml ] || sed -i -E -e \'s,"github.com/docker/app","unit/basic",g; s,"github.com/docker/app/([^"]*)","unit/basic/\\1",g\' unit-coverage.xml'
128+
sh '[ ! -e e2e-coverage.xml ] || sed -i -E -e \'s,"github.com/docker/app/e2e","e2e/basic",g\' e2e-coverage.xml'
129+
archiveArtifacts '*.xml'
130+
junit '*.xml'
131+
}
130132
sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'
131133
deleteDir()
132134
}
@@ -150,10 +152,12 @@ pipeline {
150152
}
151153
post {
152154
always {
153-
sh 'sed -i -E -e \'s,"github.com/docker/app","unit/experimental",g; s,"github.com/docker/app/([^"]*)","unit/experimental/\\1",g\' src/github.com/docker/app/_build/test-results/experimental-unit-coverage.xml'
154-
sh 'sed -i -E -e \'s,"github.com/docker/app/e2e","e2e/experimental",g\' src/github.com/docker/app/_build/test-results/experimental-e2e-coverage.xml'
155-
archiveArtifacts 'src/github.com/docker/app/_build/test-results/*.xml'
156-
junit 'src/github.com/docker/app/_build/test-results/*.xml'
155+
dir('src/github.com/docker/app/_build/test-results') {
156+
sh '[ ! -e experimental-unit-coverage.xml ] || sed -i -E -e \'s,"github.com/docker/app","unit/experimental",g; s,"github.com/docker/app/([^"]*)","unit/experimental/\\1",g\' experimental-unit-coverage.xml'
157+
sh '[ ! -e experimental-e2e-coverage.xml ] || sed -i -E -e \'s,"github.com/docker/app/e2e","e2e/experimental",g\' experimental-e2e-coverage.xml'
158+
archiveArtifacts '*.xml'
159+
junit '*.xml'
160+
}
157161
sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage-experimental'
158162
deleteDir()
159163
}

Jenkinsfile.baguette

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,12 @@ pipeline {
107107
}
108108
post {
109109
always {
110-
sh 'sed -i -E -e \'s,"github.com/docker/app","unit",g; s,"github.com/docker/app/([^"]*)","unit/\\1",g\' src/github.com/docker/app/_build/test-results/unit-coverage.xml'
111-
sh 'sed -i -E -e \'s,"github.com/docker/app/e2e","e2e/coverage",g\' src/github.com/docker/app/_build/test-results/e2e-coverage.xml'
112-
archiveArtifacts 'src/github.com/docker/app/_build/test-results/*.xml'
113-
junit 'src/github.com/docker/app/_build/test-results/*.xml'
110+
dir('src/github.com/docker/app/_build/test-results') {
111+
sh '[ ! -e unit-coverage.xml ] || sed -i -E -e \'s,"github.com/docker/app","unit",g; s,"github.com/docker/app/([^"]*)","unit/\\1",g\' unit-coverage.xml'
112+
sh '[ ! -e e2e-coverage.xml ] || sed -i -E -e \'s,"github.com/docker/app/e2e","e2e/coverage",g\' e2e-coverage.xml'
113+
archiveArtifacts '*.xml'
114+
junit '*.xml'
115+
}
114116
sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'
115117
deleteDir()
116118
}

0 commit comments

Comments
 (0)