Merge branch 'master' of https://github.com/milvus-io/milvus into 241…

…2-limit-watch
milvus-io · Dec 30, 2024 · 1885c0a · 1885c0a
2 parents 18ed157 + cb6eca8
commit 1885c0a
Show file tree

Hide file tree

Showing 402 changed files with 19,521 additions and 6,122 deletions.
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -6,3 +6,5 @@ aliases:
     - xiaofan-luan
     - yanliang567
     - jiaoew1991
+    - tedxu
+    - liliu-z
diff --git a/README.md b/README.md
@@ -250,9 +250,10 @@ Reference to cite when you use Milvus in a research paper:
 }
 ```
 <!-- Do not remove start of hero-bot -->
-<img src="https://img.shields.io/badge/all--contributors-421-orange"><br>
+<img src="https://img.shields.io/badge/all--contributors-424-orange"><br>
 <a href="https://github.com/0xflotus"><img src="https://avatars.githubusercontent.com/u/26602940?v=4" width="30px" /></a>
 <a href="https://github.com/ABNER-1"><img src="https://avatars.githubusercontent.com/u/24547351?v=4" width="30px" /></a>
+<a href="https://github.com/Abhijnan-Bajpai"><img src="https://avatars.githubusercontent.com/u/57059194?v=4" width="30px" /></a>
 <a href="https://github.com/Accagain2014"><img src="https://avatars.githubusercontent.com/u/9635216?v=4" width="30px" /></a>
 <a href="https://github.com/Ahmetyasin"><img src="https://avatars.githubusercontent.com/u/34247619?v=4" width="30px" /></a>
 <a href="https://github.com/Ald392"><img src="https://avatars.githubusercontent.com/u/166891594?v=4" width="30px" /></a>
@@ -497,6 +498,7 @@ Reference to cite when you use Milvus in a research paper:
 <a href="https://github.com/kateshaowanjou"><img src="https://avatars.githubusercontent.com/u/58837504?v=4" width="30px" /></a>
 <a href="https://github.com/klboke"><img src="https://avatars.githubusercontent.com/u/18591662?v=4" width="30px" /></a>
 <a href="https://github.com/laipz8200"><img src="https://avatars.githubusercontent.com/u/16485841?v=4" width="30px" /></a>
+<a href="https://github.com/laurazhao0611"><img src="https://avatars.githubusercontent.com/u/192320184?v=4" width="30px" /></a>
 <a href="https://github.com/lee-eve"><img src="https://avatars.githubusercontent.com/u/9720105?v=4" width="30px" /></a>
 <a href="https://github.com/lentitude2tk"><img src="https://avatars.githubusercontent.com/u/108672767?v=4" width="30px" /></a>
 <a href="https://github.com/leonardokidd"><img src="https://avatars.githubusercontent.com/u/14940941?v=4" width="30px" /></a>
@@ -671,5 +673,6 @@ Reference to cite when you use Milvus in a research paper:
 <a href="https://github.com/zhoubo0317"><img src="https://avatars.githubusercontent.com/u/51948620?v=4" width="30px" /></a>
 <a href="https://github.com/zhuwenxing"><img src="https://avatars.githubusercontent.com/u/12268675?v=4" width="30px" /></a>
 <a href="https://github.com/zhuyaguang"><img src="https://avatars.githubusercontent.com/u/8857976?v=4" width="30px" /></a>
+<a href="https://github.com/zjjzyl"><img src="https://avatars.githubusercontent.com/u/6939141?v=4" width="30px" /></a>
 <a href="https://github.com/zxf2017"><img src="https://avatars.githubusercontent.com/u/29620478?v=4" width="30px" /></a>
 <!-- Do not remove end of hero-bot -->
diff --git a/README_CN.md b/README_CN.md
@@ -183,9 +183,10 @@ Milvus [训练营](https://github.com/milvus-io/bootcamp)能够帮助你了解
 ### All contributors
 
 <br><!-- Do not remove start of hero-bot -->
-<img src="https://img.shields.io/badge/all--contributors-421-orange"><br>
+<img src="https://img.shields.io/badge/all--contributors-424-orange"><br>
 <a href="https://github.com/0xflotus"><img src="https://avatars.githubusercontent.com/u/26602940?v=4" width="30px" /></a>
 <a href="https://github.com/ABNER-1"><img src="https://avatars.githubusercontent.com/u/24547351?v=4" width="30px" /></a>
+<a href="https://github.com/Abhijnan-Bajpai"><img src="https://avatars.githubusercontent.com/u/57059194?v=4" width="30px" /></a>
 <a href="https://github.com/Accagain2014"><img src="https://avatars.githubusercontent.com/u/9635216?v=4" width="30px" /></a>
 <a href="https://github.com/Ahmetyasin"><img src="https://avatars.githubusercontent.com/u/34247619?v=4" width="30px" /></a>
 <a href="https://github.com/Ald392"><img src="https://avatars.githubusercontent.com/u/166891594?v=4" width="30px" /></a>
@@ -430,6 +431,7 @@ Milvus [训练营](https://github.com/milvus-io/bootcamp)能够帮助你了解
 <a href="https://github.com/kateshaowanjou"><img src="https://avatars.githubusercontent.com/u/58837504?v=4" width="30px" /></a>
 <a href="https://github.com/klboke"><img src="https://avatars.githubusercontent.com/u/18591662?v=4" width="30px" /></a>
 <a href="https://github.com/laipz8200"><img src="https://avatars.githubusercontent.com/u/16485841?v=4" width="30px" /></a>
+<a href="https://github.com/laurazhao0611"><img src="https://avatars.githubusercontent.com/u/192320184?v=4" width="30px" /></a>
 <a href="https://github.com/lee-eve"><img src="https://avatars.githubusercontent.com/u/9720105?v=4" width="30px" /></a>
 <a href="https://github.com/lentitude2tk"><img src="https://avatars.githubusercontent.com/u/108672767?v=4" width="30px" /></a>
 <a href="https://github.com/leonardokidd"><img src="https://avatars.githubusercontent.com/u/14940941?v=4" width="30px" /></a>
@@ -604,6 +606,7 @@ Milvus [训练营](https://github.com/milvus-io/bootcamp)能够帮助你了解
 <a href="https://github.com/zhoubo0317"><img src="https://avatars.githubusercontent.com/u/51948620?v=4" width="30px" /></a>
 <a href="https://github.com/zhuwenxing"><img src="https://avatars.githubusercontent.com/u/12268675?v=4" width="30px" /></a>
 <a href="https://github.com/zhuyaguang"><img src="https://avatars.githubusercontent.com/u/8857976?v=4" width="30px" /></a>
+<a href="https://github.com/zjjzyl"><img src="https://avatars.githubusercontent.com/u/6939141?v=4" width="30px" /></a>
 <a href="https://github.com/zxf2017"><img src="https://avatars.githubusercontent.com/u/29620478?v=4" width="30px" /></a>
 <!-- Do not remove end of hero-bot --><br>
 

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'
                                 }
                             }
                         }