enhance: only use streaming service on e2e and nightly e2e (milvus-io…

…#38743) issue: milvus-io#38399 Signed-off-by: chyezh <[email protected]>
NicoYuan1986 · Dec 26, 2024 · 930bfd1 · 930bfd1
1 parent a5a267c
commit 930bfd1
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 378 deletions.
diff --git a/ci/jenkins/Nightly2.groovy b/ci/jenkins/Nightly2.groovy
@@ -96,7 +96,7 @@ pipeline {
                 axes {
                     axis {
                         name 'milvus_deployment_option'
-                        values 'standalone', 'distributed-pulsar', 'distributed-kafka', 'standalone-authentication', 'standalone-one-pod', 'distributed-streaming-service'
+                        values 'standalone', 'distributed-pulsar', 'distributed-kafka', 'standalone-authentication', 'standalone-one-pod'
                     }
                 }
                 stages {

diff --git a/ci/jenkins/PR.groovy b/ci/jenkins/PR.groovy
@@ -89,7 +89,7 @@ pipeline {
                 axes {
                     axis {
                         name 'milvus_deployment_option'
-                        values 'standalone', 'distributed', 'standalone-kafka-mmap', 'distributed-streaming-service'
+                        values 'standalone', 'distributed', 'standalone-kafka-mmap'
                     }
                 }
                 stages {
@@ -100,32 +100,15 @@ pipeline {
                                     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,
-                                                    pytest_image: pytest_image,
-                                                    helm_image: helm_image,
-                                                    milvus_deployment_option: milvus_deployment_option,
-                                                    verbose: 'false'
-                                        } catch (Exception e) {
-                                            println e
-                                        }
-                                    } 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,
-                                                    pytest_image: pytest_image,
-                                                    helm_image: helm_image,
-                                                    milvus_deployment_option: milvus_deployment_option,
-                                                    verbose: 'false'
-                                    }
+                                    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,
+                                                pytest_image: pytest_image,
+                                                helm_image: helm_image,
+                                                milvus_deployment_option: milvus_deployment_option,
+                                                verbose: 'false'
                                 }
                             }
                         }

diff --git a/tests/_helm/values/e2e/distributed b/tests/_helm/values/e2e/distributed
@@ -8,6 +8,8 @@ affinity:
       weight: 1
 cluster:
   enabled: true
+streaming:
+  enabled: true
 dataCoordinator:
   resources:
     limits:

diff --git a/tests/_helm/values/e2e/distributed-streaming-service b/tests/_helm/values/e2e/distributed-streaming-service
diff --git a/tests/_helm/values/e2e/standalone b/tests/_helm/values/e2e/standalone
@@ -8,6 +8,8 @@ affinity:
       weight: 1
 cluster:
   enabled: false
+streaming:
+  enabled: true
 dataCoordinator:
   resources:
     limits:

diff --git a/tests/_helm/values/e2e/standalone-kafka-mmap b/tests/_helm/values/e2e/standalone-kafka-mmap
@@ -8,6 +8,8 @@ affinity:
       weight: 1
 cluster:
   enabled: false
+streaming:
+  enabled: true
 dataCoordinator:
   resources:
     limits:

diff --git a/tests/_helm/values/e2e/standalone-one-pod b/tests/_helm/values/e2e/standalone-one-pod
@@ -8,6 +8,8 @@ affinity:
       weight: 1
 cluster:
   enabled: false
+streaming:
+  enabled: true
 etcd:
   enabled: false
   metrics:

diff --git a/tests/_helm/values/nightly/distributed-kafka b/tests/_helm/values/nightly/distributed-kafka
@@ -1,5 +1,7 @@
 cluster:
   enabled: true
+streaming:
+  enabled: true
 common:
   security:
     authorizationEnabled: false

diff --git a/tests/_helm/values/nightly/distributed-pulsar b/tests/_helm/values/nightly/distributed-pulsar
@@ -1,5 +1,7 @@
 cluster:
   enabled: true
+streaming:
+  enabled: true
 common:
   security:
     authorizationEnabled: false