From 8a088f1d3b9632c7682e3decf24fe5d383f191da Mon Sep 17 00:00:00 2001
From: Jenny Li <jing.li@zilliz.com>
Date: Mon, 10 Jan 2022 14:33:34 +0800
Subject: [PATCH] [skip e2e] Update nightly to run pytest in separate pod
 (#15090)

Signed-off-by: Jenny Li <jing.li@zilliz.com>
---
 build/ci/jenkins/Nightly.groovy | 37 +++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/build/ci/jenkins/Nightly.groovy b/build/ci/jenkins/Nightly.groovy
index 7c14ff5f81..b5affc86b4 100644
--- a/build/ci/jenkins/Nightly.groovy
+++ b/build/ci/jenkins/Nightly.groovy
@@ -22,7 +22,7 @@ pipeline {
     }
     agent {
         kubernetes {
-            label "milvus-e2e-test-nightly"
+            label "milvus-build-nightly"
             inheritFrom 'default'
             defaultContainer 'main'
             yamlFile "build/ci/jenkins/pod/rte.yaml"
@@ -146,6 +146,15 @@ pipeline {
                             }
                         }
                     stage('E2E Test'){
+                        agent {
+                                kubernetes {
+                                    label 'milvus-e2e-test-nightly'
+                                    inheritFrom 'default'
+                                    defaultContainer 'main'
+                                    yamlFile 'build/ci/jenkins/pod/rte.yaml'
+                                    customWorkspace '/home/jenkins/agent/workspace'
+                                }
+                        }
                             steps {
                                 container('pytest') {
                                     dir ('tests/scripts') {
@@ -205,34 +214,30 @@ pipeline {
                             }
                         }
                     }
-                     always {
+                    always {
+                        container('pytest'){
+                            dir("${env.ARTIFACTS}") {
+                                    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
+                            }
+                        }
                         container('main') {
-                            dir ('tests/scripts') {  
+                            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 {
-                                    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
                                     }
+                                }
                             }
                         }
-                        }
+                    
                     }
                 }
-                }
+            }
         }
     }
 }