From fd9cfd789bb0e6ba65f9fe0b0f2e5ab9a16d728c Mon Sep 17 00:00:00 2001
From: Peter Somogyi <psomogyi@apache.org>
Date: Thu, 10 Oct 2019 13:27:50 +0200
Subject: [PATCH] HBASE-23114 Use archiveArtifacts in Jenkinsfiles (#681)

Signed-off-by: Michael Stack <stack@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 cb66cc86c6ff..ffc616716a54 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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/**/*'
             }
           }
         }
diff --git a/dev-support/adhoc_run_tests/Jenkinsfile b/dev-support/adhoc_run_tests/Jenkinsfile
index b3793cd97fbb..e06fdba325a6 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 75354e8591f8..d5e750a47e9e 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 bca95ddb1899..5b0d581dd426 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/*'
     }
   }
 }