test: set specific mq for standalone e2e (#41859)

related issue: https://github.com/milvus-io/milvus/issues/41819 1. remove useless distributed config 2. set specific mq for standalone e2e --------- Signed-off-by: yanliang567 <yanliang.qiao@zilliz.com>
2025-12-06 09:08:43 +08:00 · 2025-05-16 10:30:23 +08:00 · 2025-05-16 10:30:23 +08:00 · 83cdd6b121
commit 83cdd6b121
parent 6c1a37fca1
11 changed files with 35 additions and 233 deletions
--- a/ci/jenkins/PR-Arm.groovy
+++ b/ci/jenkins/PR-Arm.groovy
@ -4,7 +4,7 @@ int total_timeout_minutes = 60 * 5
 int e2e_timeout_seconds = 120 * 60
 def imageTag=''
 int case_timeout_seconds = 20 * 60
-def chart_version='4.1.28'
+def chart_version='4.2.48'
 pipeline {
    options {
        timestamps()
--- a/ci/jenkins/PR-for-go-sdk.groovy
+++ b/ci/jenkins/PR-for-go-sdk.groovy
@ -2,7 +2,7 @@

 def pod = libraryResource 'io/milvus/pod/tekton-4am.yaml'

-def milvus_helm_chart_version = '4.2.8'
+def milvus_helm_chart_version = '4.2.48'

 pipeline {
    options {
@ -87,7 +87,7 @@ pipeline {
                axes {
                    axis {
                        name 'milvus_deployment_option'
-                        values 'standalone', 'distributed'
+                        values 'standalone', 'distributed-pulsar'
                    }
                }
                stages {
--- a/ci/jenkins/PRGPU.groovy
+++ b/ci/jenkins/PRGPU.groovy
@ -4,7 +4,7 @@ int total_timeout_minutes = 60 * 5
 int e2e_timeout_seconds = 70 * 60
 def imageTag=''
 int case_timeout_seconds = 10 * 60
-def chart_version='4.1.8'
+def chart_version='4.2.48'
 pipeline {
    options {
        timestamps()
@ -170,7 +170,7 @@ pipeline {
                                    script {
                                        def release_name=sh(returnStdout: true, script: 'MODE=\"gpu\" ./get_release_name.sh')
                                        def clusterEnabled = 'false'
-                                        if ("${MILVUS_SERVER_TYPE}" == "distributed") {
+                                        if ("${MILVUS_SERVER_TYPE}" == "distributed-pulsar") {
                                            clusterEnabled = "true"
                                        }
                                        if ("${MILVUS_CLIENT}" == "pymilvus") {
--- a/ci/jenkins/UT-CPP.groovy
+++ b/ci/jenkins/UT-CPP.groovy
@ -1,7 +1,7 @@
@Library('jenkins-shared-library@tekton') _

 def pod = libraryResource 'io/milvus/pod/tekton-4am.yaml'
-def milvus_helm_chart_version = '4.2.8'
+def milvus_helm_chart_version = '4.2.48'

 pipeline {
    options {
--- a/tests/_helm/values/e2e/distributed
+++ b/tests/_helm/values/e2e/distributed
@ -1,227 +0,0 @@
-affinity:
-  nodeAffinity:
-    preferredDuringSchedulingIgnoredDuringExecution:
-    - preference:
-        matchExpressions:
-        - key: node-role.kubernetes.io/e2e
-          operator: Exists
-      weight: 1
-cluster:
-  enabled: true
-streaming:
-  enabled: true
-proxy:
-  resources:
-    limits:
-      cpu: "1"
-      memory: 4Gi
-    requests:
-      cpu: "0.3"
-      memory: 256Mi
-dataNode:
-  resources:
-    limits:
-      cpu: "2"
-      memory: 8Gi
-    requests:
-      cpu: "0.5"
-      memory: 500Mi
-indexNode:
-  enabled: false
-  disk:
-    enabled: true
-  resources:
-    limits:
-      cpu: "2"
-      memory: 8Gi
-    requests:
-      cpu: "0.5"
-      memory: 500Mi
-queryNode:
-  disk:
-    enabled: true
-  resources:
-    limits:
-      cpu: "1"
-      memory: 4Gi
-    requests:
-      cpu: "0.5"
-      memory: 512Mi
-streamingNode:
-  resources:
-    limits:
-      cpu: "2"
-      memory: 8Gi
-    requests:
-      cpu: "0.5"
-      memory: 512Mi
-mixCoordinator:
-  resources:
-    limits:
-      cpu: "1"
-      memory: 4Gi
-    requests:
-      cpu: "0.2"
-      memory: 256Mi
-service:
-  type: ClusterIP
-log:
-  level: debug
-extraConfigFiles:
-  user.yaml: |+
-    dataCoord:
-      gc:
-        interval: 1800
-        missingTolerance: 1800
-        dropTolerance: 1800
-metrics:
-  serviceMonitor:
-    enabled: true
-etcd:
-  affinity:
-    nodeAffinity:
-      preferredDuringSchedulingIgnoredDuringExecution:
-      - preference:
-          matchExpressions:
-          - key: node-role.kubernetes.io/e2e
-            operator: Exists
-        weight: 1
-  metrics:
-    enabled: true
-    podMonitor:
-      enabled: true
-  replicaCount: 1
-  resources:
-    requests:
-      cpu: "0.2"
-      memory: 256Mi
-    limits:
-      cpu: "1"
-      memory: 4Gi
-  tolerations:
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/e2e
-    operator: Exists
-image:
-  all:
-    pullPolicy: Always
-    repository: harbor.milvus.io/milvus/milvus
-    tag: PR-35426-20240812-46dadb120
-minio:
-  affinity:
-    nodeAffinity:
-      preferredDuringSchedulingIgnoredDuringExecution:
-      - preference:
-          matchExpressions:
-          - key: node-role.kubernetes.io/e2e
-            operator: Exists
-        weight: 1
-  mode: standalone
-  resources:
-    requests:
-      cpu: "0.2"
-      memory: 512Mi
-    limits:
-      cpu: "1"
-      memory: 4Gi
-  tolerations:
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/e2e
-    operator: Exists
-pulsarv3:
-  enabled: true
-  bookkeeper:
-    affinity:
-      nodeAffinity:
-        preferredDuringSchedulingIgnoredDuringExecution:
-        - preference:
-            matchExpressions:
-            - key: node-role.kubernetes.io/e2e
-              operator: Exists
-          weight: 1
-    resources:
-      requests:
-        cpu: "0.1"
-        memory: 256Mi
-      limits:
-        cpu: "0.5"
-        memory: 2Gi
-    tolerations:
-    - effect: NoSchedule
-      key: node-role.kubernetes.io/e2e
-      operator: Exists
-  broker:
-    affinity:
-      nodeAffinity:
-        preferredDuringSchedulingIgnoredDuringExecution:
-        - preference:
-            matchExpressions:
-            - key: node-role.kubernetes.io/e2e
-              operator: Exists
-          weight: 1
-    replicaCount: 2
-    resources:
-      requests:
-        cpu: "0.1"
-        memory: 256Mi
-      limits:
-        cpu: "0.5"
-        memory: 4Gi
-    tolerations:
-    - effect: NoSchedule
-      key: node-role.kubernetes.io/e2e
-      operator: Exists
-  components:
-    autorecovery: false
-  proxy:
-    affinity:
-      nodeAffinity:
-        preferredDuringSchedulingIgnoredDuringExecution:
-        - preference:
-            matchExpressions:
-            - key: node-role.kubernetes.io/e2e
-              operator: Exists
-          weight: 1
-    resources:
-      requests:
-        cpu: "0.1"
-        memory: 256Mi
-      limits:
-        cpu: "0.5"
-        memory: 2Gi
-    tolerations:
-    - effect: NoSchedule
-      key: node-role.kubernetes.io/e2e
-      operator: Exists
-    wsResources:
-      requests:
-        cpu: "0.1"
-        memory: 256Mi
-      limits:
-        cpu: "0.5"
-        memory: 2Gi
-  zookeeper:
-    affinity:
-      nodeAffinity:
-        preferredDuringSchedulingIgnoredDuringExecution:
-        - preference:
-            matchExpressions:
-            - key: node-role.kubernetes.io/e2e
-              operator: Exists
-          weight: 1
-    replicaCount: 1
-    resources:
-      requests:
-        cpu: "0.1"
-        memory: 256Mi
-      limits:
-        cpu: "0.5"
-        memory: 2Gi
-    tolerations:
-    - effect: NoSchedule
-      key: node-role.kubernetes.io/e2e
-      operator: Exists
-tolerations:
- effect: NoSchedule
-  key: node-role.kubernetes.io/e2e
-  operator: Exists
--- a/tests/_helm/values/e2e/standalone
+++ b/tests/_helm/values/e2e/standalone
@ -13,6 +13,7 @@ streaming:
 service:
  type: ClusterIP
 standalone:
+  messageQueue: rocksmq
  disk:
    enabled: true
  resources:
--- a/tests/_helm/values/e2e/standalone-kafka-mmap
+++ b/tests/_helm/values/e2e/standalone-kafka-mmap
@ -13,6 +13,7 @@ streaming:
 service:
  type: ClusterIP
 standalone:
+  messageQueue: kafka
  disk:
    enabled: true
  resources:
--- a/tests/_helm/values/nightly/distributed-kafka
+++ b/tests/_helm/values/nightly/distributed-kafka
@ -1,3 +1,11 @@
+affinity:
+  nodeAffinity:
+    preferredDuringSchedulingIgnoredDuringExecution:
+    - preference:
+        matchExpressions:
+        - key: node-role.kubernetes.io/e2e
+          operator: Exists
+      weight: 1
 cluster:
  enabled: true
 streaming:
--- a/tests/_helm/values/nightly/distributed-pulsar-mmap
+++ b/tests/_helm/values/nightly/distributed-pulsar-mmap
@ -1,3 +1,11 @@
+affinity:
+  nodeAffinity:
+    preferredDuringSchedulingIgnoredDuringExecution:
+    - preference:
+        matchExpressions:
+        - key: node-role.kubernetes.io/e2e
+          operator: Exists
+      weight: 1
 cluster:
  enabled: true
 streaming:
--- a/tests/_helm/values/nightly/distributed-woodpecker
+++ b/tests/_helm/values/nightly/distributed-woodpecker
@ -1,3 +1,11 @@
+affinity:
+  nodeAffinity:
+    preferredDuringSchedulingIgnoredDuringExecution:
+    - preference:
+        matchExpressions:
+        - key: node-role.kubernetes.io/e2e
+          operator: Exists
+      weight: 1
 cluster:
  enabled: true
 woodpecker:
--- a/tests/_helm/values/nightly/standalone-authentication-mmap
+++ b/tests/_helm/values/nightly/standalone-authentication-mmap
@ -12,7 +12,10 @@ streaming:
  enabled: true
 service:
  type: ClusterIP
+woodpecker:
+  enabled: true
 standalone:
+  messageQueue: woodpecker
  disk:
    enabled: true
  resources: