Skip to content

Commit fd9cfd7

Browse files
authored
HBASE-23114 Use archiveArtifacts in Jenkinsfiles (#681)
Signed-off-by: Michael Stack <stack@apache.org>
1 parent fec4c52 commit fd9cfd7

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

dev-support/Jenkinsfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ pipeline {
239239
always {
240240
stash name: 'general-result', includes: "${OUTPUT_DIR_RELATIVE}/commentfile"
241241
// Has to be relative to WORKSPACE.
242-
archive "${env.OUTPUT_DIR_RELATIVE}/*"
243-
archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
242+
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/*"
243+
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/**/*"
244244
publishHTML target: [
245245
allowMissing: true,
246246
keepAll: true,
@@ -320,8 +320,8 @@ pipeline {
320320
fi
321321
'''
322322
// Has to be relative to WORKSPACE.
323-
archive "${env.OUTPUT_DIR_RELATIVE}/*"
324-
archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
323+
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/*"
324+
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/**/*"
325325
publishHTML target: [
326326
allowMissing : true,
327327
keepAll : true,
@@ -400,8 +400,8 @@ pipeline {
400400
fi
401401
'''
402402
// Has to be relative to WORKSPACE.
403-
archive "${env.OUTPUT_DIR_RELATIVE}/*"
404-
archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
403+
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/*"
404+
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/**/*"
405405
publishHTML target: [
406406
allowMissing : true,
407407
keepAll : true,
@@ -487,8 +487,8 @@ pipeline {
487487
fi
488488
'''
489489
// Has to be relative to WORKSPACE.
490-
archive "${env.OUTPUT_DIR_RELATIVE}/*"
491-
archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
490+
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/*"
491+
archiveArtifacts artifacts: "${env.OUTPUT_DIR_RELATIVE}/**/*"
492492
publishHTML target: [
493493
allowMissing : true,
494494
keepAll : true,
@@ -620,10 +620,10 @@ pipeline {
620620
post {
621621
always {
622622
stash name: 'srctarball-result', includes: "output-srctarball/commentfile,output-integration/commentfile"
623-
archive 'output-srctarball/*'
624-
archive 'output-srctarball/**/*'
625-
archive 'output-integration/*'
626-
archive 'output-integration/**/*'
623+
archiveArtifacts artifacts: 'output-srctarball/*'
624+
archiveArtifacts artifacts: 'output-srctarball/**/*'
625+
archiveArtifacts artifacts: 'output-integration/*'
626+
archiveArtifacts artifacts: 'output-integration/**/*'
627627
}
628628
}
629629
}

dev-support/adhoc_run_tests/Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ pipeline {
8181
}
8282
post {
8383
always {
84-
archive 'output/*'
85-
archive 'output/**/*'
84+
archiveArtifacts artifacts: 'output/*'
85+
archiveArtifacts artifacts: 'output/**/*'
8686
}
8787
failure {
88-
archive 'component/**/target/surefire-reports/*'
88+
archiveArtifacts artifacts: 'component/**/target/surefire-reports/*'
8989
}
9090
}
9191
}

dev-support/flaky-tests/flaky-reporting.Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pipeline {
5151
post {
5252
always {
5353
// Has to be relative to WORKSPACE.
54-
archive "includes,excludes,dashboard.html"
54+
archiveArtifacts artifacts: "includes,excludes,dashboard.html"
5555
publishHTML target: [
5656
allowMissing: true,
5757
keepAll: true,

dev-support/flaky-tests/run-flaky-tests.Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ pipeline {
7373
always {
7474
junit testResults: "**/surefire-reports/*.xml", allowEmptyResults: true
7575
// TODO compress these logs
76-
archive 'includes.txt,**/surefire-reports/*,**/test-data/*,target/machine/*'
76+
archiveArtifacts artifacts: 'includes.txt,**/surefire-reports/*,**/test-data/*,target/machine/*'
7777
}
7878
}
7979
}

0 commit comments

Comments
 (0)