From b47e60aee4bb8ebf3c4bb7f27fcc4d8ee0d06587 Mon Sep 17 00:00:00 2001 From: Jenny Li Date: Thu, 9 Dec 2021 15:55:19 +0800 Subject: [PATCH] [skip ci] Change the sequence for logs & uninstall helm relese (#13070) Signed-off-by: Jenny Li --- build/ci/jenkins/Nightly.groovy | 39 ++++++++++++++++----------------- build/ci/jenkins/PR.groovy | 27 ++++++++++------------- 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/build/ci/jenkins/Nightly.groovy b/build/ci/jenkins/Nightly.groovy index 82c9df74b4..2b2fb8873d 100644 --- a/build/ci/jenkins/Nightly.groovy +++ b/build/ci/jenkins/Nightly.groovy @@ -202,32 +202,31 @@ pipeline { } } } - always { - container('pytest') { - dir ('tests/scripts') { - script { - def release_name=sh(returnStdout: true, script: './get_release_name.sh') - sh "./ci_logs.sh --log-dir /ci-logs --artifacts-name ${env.ARTIFACTS}/artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${SEMVER}-${env.BUILD_NUMBER}-${MILVUS_CLIENT}-e2e-logs \ - --release-name ${release_name} " - dir("${env.ARTIFACTS}") { - if ("${MILVUS_CLIENT}" == "pymilvus") { - sh "tar -zcvf artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${MILVUS_CLIENT}-pytest-logs.tar.gz /tmp/ci_logs/test --remove-files || true" - } - archiveArtifacts artifacts: "**.tar.gz", allowEmptyArchive: true - } - } - } - } - } - cleanup { + always { container('main') { dir ('tests/scripts') { script { - def release_name=sh(returnStdout: true, script: './get_release_name.sh') - sh "./uninstall_milvus.sh --release-name ${release_name}" + def release_name=sh(returnStdout: true, script: './get_release_name.sh') + sh "./uninstall_milvus.sh --release-name ${release_name}" } } } + container('pytest') { + dir ('tests/scripts') { + script { + def release_name = sh(returnStdout: true, script: './get_release_name.sh ') + sh "./ci_logs.sh --log-dir /ci-logs --artifacts-name ${env.ARTIFACTS}/artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${SEMVER}-${env.BUILD_NUMBER}-${MILVUS_CLIENT}-e2e-logs \ + --release-name ${release_name}" + dir("${env.ARTIFACTS}") { + if ("${MILVUS_CLIENT}" == "pymilvus") { + sh "tar -zcvf artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${MILVUS_CLIENT}-pytest-logs.tar.gz /tmp/ci_logs/test --remove-files || true" + } + archiveArtifacts artifacts: "artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${MILVUS_CLIENT}-pytest-logs.tar.gz ", allowEmptyArchive: true + archiveArtifacts artifacts: "artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${SEMVER}-${env.BUILD_NUMBER}-${MILVUS_CLIENT}-e2e-logs.tar.gz", allowEmptyArchive: true + } + } + } + } } } } diff --git a/build/ci/jenkins/PR.groovy b/build/ci/jenkins/PR.groovy index 20d37a230e..9fbc6333a4 100644 --- a/build/ci/jenkins/PR.groovy +++ b/build/ci/jenkins/PR.groovy @@ -166,6 +166,14 @@ pipeline { } post { always { + container('main') { + dir ('tests/scripts') { + script { + def release_name=sh(returnStdout: true, script: './get_release_name.sh') + sh "./uninstall_milvus.sh --release-name ${release_name}" + } + } + } container('pytest') { dir ('tests/scripts') { script { @@ -176,10 +184,11 @@ pipeline { if ("${MILVUS_CLIENT}" == "pymilvus") { sh "tar -zcvf artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${MILVUS_CLIENT}-pytest-logs.tar.gz /tmp/ci_logs/test --remove-files || true" } - archiveArtifacts artifacts: "**.tar.gz", allowEmptyArchive: true + archiveArtifacts artifacts: "artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${MILVUS_CLIENT}-pytest-logs.tar.gz ", allowEmptyArchive: true + archiveArtifacts artifacts: "artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${SEMVER}-${env.BUILD_NUMBER}-${MILVUS_CLIENT}-e2e-logs.tar.gz", allowEmptyArchive: true } } - } + } } } unsuccessful { @@ -194,20 +203,8 @@ pipeline { } } } - - // clean up when successful - cleanup{ - container('main') { - dir ('tests/scripts') { - script { - def release_name=sh(returnStdout: true, script: './get_release_name.sh') - sh "./uninstall_milvus.sh --release-name ${release_name}" - } - } - } - } - } } + } } } }