You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ps...@apache.org on 2019/10/10 18:05:58 UTC
[hbase] branch branch-2.1 updated: HBASE-23114 Use archiveArtifacts
in Jenkinsfiles (#681)
This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new d220ab3 HBASE-23114 Use archiveArtifacts in Jenkinsfiles (#681)
d220ab3 is described below
commit d220ab37d580d1a1b2bedcf655cb6e6801c3b9bd
Author: Peter Somogyi <ps...@apache.org>
AuthorDate: Thu Oct 10 13:27:50 2019 +0200
HBASE-23114 Use archiveArtifacts in Jenkinsfiles (#681)
Signed-off-by: Michael Stack <st...@apache.org>
---
dev-support/Jenkinsfile | 24 +++++++++++-----------
dev-support/adhoc_run_tests/Jenkinsfile | 6 +++---
.../flaky-tests/flaky-reporting.Jenkinsfile | 2 +-
.../flaky-tests/run-flaky-tests.Jenkinsfile | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 5bc3ef6..0e640a3 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -238,8 +238,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,
@@ -319,8 +319,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,
@@ -399,8 +399,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,
@@ -486,8 +486,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,
@@ -619,10 +619,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/**/*'
}
}
}
diff --git a/dev-support/adhoc_run_tests/Jenkinsfile b/dev-support/adhoc_run_tests/Jenkinsfile
index b3793cd..e06fdba 100644
--- a/dev-support/adhoc_run_tests/Jenkinsfile
+++ b/dev-support/adhoc_run_tests/Jenkinsfile
@@ -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/*'
}
}
}
diff --git a/dev-support/flaky-tests/flaky-reporting.Jenkinsfile b/dev-support/flaky-tests/flaky-reporting.Jenkinsfile
index 75354e8..d5e750a 100644
--- a/dev-support/flaky-tests/flaky-reporting.Jenkinsfile
+++ b/dev-support/flaky-tests/flaky-reporting.Jenkinsfile
@@ -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,
diff --git a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
index bca95dd..5b0d581 100644
--- a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
+++ b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
@@ -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/*'
}
}
}