Skip to content

Commit

Permalink
HBASE-23114 Use archiveArtifacts in Jenkinsfiles (#681)
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Stack <[email protected]>
  • Loading branch information
petersomogyi authored Oct 10, 2019
1 parent fec4c52 commit fd9cfd7
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
24 changes: 12 additions & 12 deletions dev-support/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ pipeline {
always {
stash name: 'general-result', includes: "${OUTPUT_DIR_RELATIVE}/commentfile"
// Has to be relative to WORKSPACE.
archive "${env.OUTPUT_DIR_RELATIVE}/*"
archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/*"
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/**/*"
publishHTML target: [
allowMissing: true,
keepAll: true,
Expand Down Expand Up @@ -320,8 +320,8 @@ pipeline {
fi
'''
// Has to be relative to WORKSPACE.
archive "${env.OUTPUT_DIR_RELATIVE}/*"
archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/*"
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/**/*"
publishHTML target: [
allowMissing : true,
keepAll : true,
Expand Down Expand Up @@ -400,8 +400,8 @@ pipeline {
fi
'''
// Has to be relative to WORKSPACE.
archive "${env.OUTPUT_DIR_RELATIVE}/*"
archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/*"
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/**/*"
publishHTML target: [
allowMissing : true,
keepAll : true,
Expand Down Expand Up @@ -487,8 +487,8 @@ pipeline {
fi
'''
// Has to be relative to WORKSPACE.
archive "${env.OUTPUT_DIR_RELATIVE}/*"
archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/*"
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/**/*"
publishHTML target: [
allowMissing : true,
keepAll : true,
Expand Down Expand Up @@ -620,10 +620,10 @@ pipeline {
post {
always {
stash name: 'srctarball-result', includes: "output-srctarball/commentfile,output-integration/commentfile"
archive 'output-srctarball/*'
archive 'output-srctarball/**/*'
archive 'output-integration/*'
archive 'output-integration/**/*'
archiveArtifacts artifacts: 'output-srctarball/*'
archiveArtifacts artifacts: 'output-srctarball/**/*'
archiveArtifacts artifacts: 'output-integration/*'
archiveArtifacts artifacts: 'output-integration/**/*'
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions dev-support/adhoc_run_tests/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ pipeline {
}
post {
always {
archive 'output/*'
archive 'output/**/*'
archiveArtifacts artifacts: 'output/*'
archiveArtifacts artifacts: 'output/**/*'
}
failure {
archive 'component/**/target/surefire-reports/*'
archiveArtifacts artifacts: 'component/**/target/surefire-reports/*'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion dev-support/flaky-tests/flaky-reporting.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pipeline {
post {
always {
// Has to be relative to WORKSPACE.
archive "includes,excludes,dashboard.html"
archiveArtifacts artifacts: "includes,excludes,dashboard.html"
publishHTML target: [
allowMissing: true,
keepAll: true,
Expand Down
2 changes: 1 addition & 1 deletion dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pipeline {
always {
junit testResults: "**/surefire-reports/*.xml", allowEmptyResults: true
// TODO compress these logs
archive 'includes.txt,**/surefire-reports/*,**/test-data/*,target/machine/*'
archiveArtifacts artifacts: 'includes.txt,**/surefire-reports/*,**/test-data/*,target/machine/*'
}
}
}

0 comments on commit fd9cfd7

Please sign in to comment.