Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: set proper parameters for the tar step #4696

Merged
merged 6 commits into from
Feb 17, 2021
Merged

ci: set proper parameters for the tar step #4696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87b21ac
fix: set proper parameters for the tar step
kuisathaverat Feb 8, 2021
48ae153
fix: move everything to the build folder
kuisathaverat Feb 8, 2021
4c8ff69
Merge branch 'master' into fix_tar_step
kuisathaverat Feb 9, 2021
92a4796
Merge branch 'master' into fix_tar_step
kuisathaverat Feb 10, 2021
b1b9e81
Merge branch 'master' into fix_tar_step
kuisathaverat Feb 15, 2021
07b690a
Merge branch 'master' into fix_tar_step
kuisathaverat Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/scripts/docker-get-logs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -euo pipefail

STEP=${1:-""}

DOCKER_INFO_DIR="docker-info/${STEP}"
DOCKER_INFO_DIR="build/docker-info/${STEP}"
mkdir -p ${DOCKER_INFO_DIR}
cp docker-compose*.yml ${DOCKER_INFO_DIR}
cd ${DOCKER_INFO_DIR}
Expand Down
35 changes: 19 additions & 16 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,15 @@ pipeline {
}
post {
always {
coverageReport("${BASE_DIR}/build/coverage")
junit(allowEmptyResults: true,
keepLongStdio: true,
testResults: "${BASE_DIR}/build/junit-*.xml"
)
catchError(buildResult: 'SUCCESS', message: 'Failed to grab test results tar files', stageResult: 'SUCCESS') {
tar(file: "coverage-files.tgz", archive: true, dir: "coverage", pathPrefix: "${BASE_DIR}/build")
dir("${BASE_DIR}/build"){
coverageReport("coverage")
junit(allowEmptyResults: true,
keepLongStdio: true,
testResults: "junit-*.xml"
)
catchError(buildResult: 'SUCCESS', message: 'Failed to grab test results tar files', stageResult: 'SUCCESS') {
tar(file: "coverage-files.tgz", archive: true, dir: "coverage")
}
}
codecov(repo: env.REPO, basedir: "${BASE_DIR}", secret: "${CODECOV_SECRET}")
}
Expand Down Expand Up @@ -293,17 +295,18 @@ pipeline {
}
post {
always {
dir("${BASE_DIR}"){
dir("${BASE_DIR}/build"){
archiveArtifacts(allowEmptyArchive: true,
artifacts: "docker-info/**",
defaultExcludes: false)
junit(allowEmptyResults: true,
keepLongStdio: true,
testResults: "**/build/TEST-*.xml"
)
}
catchError(buildResult: 'SUCCESS', message: 'Failed to grab test results tar files', stageResult: 'SUCCESS') {
tar(file: "system-tests-linux-files.tgz", archive: true, dir: "system-tests", pathPrefix: "${BASE_DIR}/build")
defaultExcludes: false
)
junit(allowEmptyResults: true,
keepLongStdio: true,
testResults: "**/TEST-*.xml"
)
catchError(buildResult: 'SUCCESS', message: 'Failed to grab test results tar files', stageResult: 'SUCCESS') {
tar(file: "system-tests-linux-files.tgz", archive: true, dir: "system-tests")
}
}
}
}
Expand Down