enhance: able to upload pytest logs when test is done

Signed-off-by: Yellow Shine <[email protected]>
yellow-shine · Oct 14, 2024 · be847ef · be847ef
1 parent 44564f0
commit be847ef
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/ci/jenkins/Nightly2.groovy b/ci/jenkins/Nightly2.groovy
@@ -1,4 +1,4 @@
-@Library('jenkins-shared-library@v0.53.0') _
+@Library('jenkins-shared-library@v0.59.0') _
 
 def pod = libraryResource 'io/milvus/pod/tekton-4am.yaml'
 
@@ -50,7 +50,6 @@ pipeline {
             steps {
                 container('tkn') {
                     script {
-
                         def job_name = tekton.run arch: 'amd64',
                                               isPr: isPr,
                                               gitMode: gitMode ,
@@ -81,6 +80,9 @@ pipeline {
                 agent {
                     kubernetes {
                         cloud '4am'
+                        // 'milvus' template defined a ephemeral volume used for pytest result archiving
+                        // pvc name would be <pod-name>-volume-0
+                        inheritFrom 'milvus'
                         yaml pod
                     }
                 }
@@ -96,8 +98,11 @@ pipeline {
                             container('tkn') {
                                 script {
                                     def helm_release_name =  get_helm_release_name milvus_deployment_option
+                                    // pvc name would be <pod-name>-volume-0, used for pytest result archiving
+                                    def pvc = env.JENKINS_AGENT_NAME + '-volume-0'
 
                                     tekton.pytest helm_release_name: helm_release_name,
+                                              pvc: pvc,
                                               milvus_helm_version: milvus_helm_chart_version,
                                               ciMode: 'nightly',
                                               milvus_image_tag: milvus_image_tag,
@@ -128,6 +133,11 @@ pipeline {
                                                                      build_id: env.BUILD_ID
                                     }
                                 }
+                                container('jnlp') {
+                                    script {
+                                        tekton.archive_pytest_logs(milvus_deployment_option)
+                                    }
+                                }
                             }
                         }
                     }

diff --git a/ci/jenkins/PR.groovy b/ci/jenkins/PR.groovy
@@ -1,4 +1,4 @@
-@Library('jenkins-shared-library@v0.57.0') _
+@Library('jenkins-shared-library@v0.59.0') _
 
 def pod = libraryResource 'io/milvus/pod/tekton-4am.yaml'
 def milvus_helm_chart_version = '4.2.8'
@@ -66,6 +66,9 @@ pipeline {
                 agent {
                     kubernetes {
                         cloud '4am'
+                        // 'milvus' template defined a ephemeral volume used for pytest result archiving
+                        // pvc name would be <pod-name>-volume-0
+                        inheritFrom 'milvus'
                         yaml pod
                     }
                 }
@@ -81,10 +84,13 @@ pipeline {
                             container('tkn') {
                                 script {
                                     def helm_release_name =  get_helm_release_name milvus_deployment_option
+                                    // pvc name would be <pod-name>-volume-0, used for pytest result archiving
+                                    def pvc = env.JENKINS_AGENT_NAME + '-volume-0'
 
                                     if (milvus_deployment_option == 'distributed-streaming-service') {
                                         try {
                                             tekton.pytest helm_release_name: helm_release_name,
+                                                    pvc: pvc,
                                                     milvus_helm_version: milvus_helm_chart_version,
                                                     ciMode: 'e2e',
                                                     milvus_image_tag: milvus_image_tag,
@@ -97,6 +103,7 @@ pipeline {
                                         }
                                     } else {
                                         tekton.pytest helm_release_name: helm_release_name,
+                                                    pvc: pvc,
                                                     milvus_helm_version: milvus_helm_chart_version,
                                                     ciMode: 'e2e',
                                                     milvus_image_tag: milvus_image_tag,
@@ -127,6 +134,11 @@ pipeline {
                                                                      build_id: env.BUILD_ID
                                     }
                                 }
+                                container('jnlp') {
+                                    script {
+                                        tekton.archive_pytest_logs(milvus_deployment_option)
+                                    }
+                                }
                             }
                         }
                     }