From c633e579a586aab2a77512168b114c558897c415 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 23 Jul 2021 20:11:34 +0800
Subject: [PATCH] Fix cleanup workspace bug for jenkins ci (#6780)

Signed-off-by: quicksilver <zhifeng.zhang@zilliz.com>
---
 build/ci/jenkins/Jenkinsfile      | 22 ++++++++++++++--------
 build/ci/jenkins/NightlyCI.groovy |  8 +++++++-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/build/ci/jenkins/Jenkinsfile b/build/ci/jenkins/Jenkinsfile
index cddc483e4..6fbc796fe 100644
--- a/build/ci/jenkins/Jenkinsfile
+++ b/build/ci/jenkins/Jenkinsfile
@@ -86,6 +86,20 @@ pipeline {
                     }
                 }
                 post {
+                    always {
+                        container('main') {
+                            script {
+                                sh "./tests/scripts/export_logs.sh"
+                                dir("${env.ARTIFACTS}") {
+                                    sh "find ./kind -path '*/history/*' -type f | xargs tar -zcvf artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${SEMVER}-${env.BUILD_NUMBER}-${MILVUS_CLIENT}-e2e-logs.tar.gz --transform='s:^[^/]*/[^/]*/[^/]*/[^/]*/::g' || true"
+                                    if ("${MILVUS_CLIENT}" == "pymilvus-orm") {
+                                        sh "tar -zcvf artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${MILVUS_CLIENT}-pytest-logs.tar.gz ./tests/pytest_logs --remove-files || true"
+                                    }
+                                    archiveArtifacts artifacts: "**.tar.gz", allowEmptyArchive: true
+                                }
+                            }
+                        }
+                    }
                     unsuccessful {
                         container('jnlp') {
                             script {
@@ -101,14 +115,6 @@ pipeline {
                     cleanup {
                         container('main') {
                             script {
-                                sh "./tests/scripts/export_logs.sh"
-                                dir("${env.ARTIFACTS}") {
-                                    sh "find ./kind -path '*/history/*' -type f | xargs tar -zcvf artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${SEMVER}-${env.BUILD_NUMBER}-${MILVUS_CLIENT}-e2e-logs.tar.gz --transform='s:^[^/]*/[^/]*/[^/]*/[^/]*/::g' || true"
-                                    if ("${MILVUS_CLIENT}" == "pymilvus-orm") {
-                                        sh "tar -zcvf artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${MILVUS_CLIENT}-pytest-logs.tar.gz ./tests/pytest_logs --remove-files || true"
-                                    }
-                                    archiveArtifacts artifacts: "**.tar.gz", allowEmptyArchive: true
-                                }
                                 sh "kind delete cluster --name kind -v9 || true"
                                 sh 'find . -name . -o -prune -exec rm -rf -- {} +' /* clean up our workspace */
                             }
diff --git a/build/ci/jenkins/NightlyCI.groovy b/build/ci/jenkins/NightlyCI.groovy
index e63de1e3b..9293b5b7b 100644
--- a/build/ci/jenkins/NightlyCI.groovy
+++ b/build/ci/jenkins/NightlyCI.groovy
@@ -123,7 +123,7 @@ pipeline {
                             }
                         }
                     }
-                    cleanup {
+                    always {
                         container('main') {
                             script {
                                 sh "./tests/scripts/export_logs.sh"
@@ -134,6 +134,12 @@ pipeline {
                                     }
                                     archiveArtifacts artifacts: "**.tar.gz", allowEmptyArchive: true
                                 }
+                            }
+                        }
+                    }
+                    cleanup {
+                        container('main') {
+                            script {
                                 sh "kind delete cluster --name kind -v9 || true"
                                 sh 'find . -name . -o -prune -exec rm -rf -- {} +' /* clean up our workspace */
                             }
-- 
GitLab