Use knowhere-test refactor

Signed-off-by: Yudong Cai <[email protected]>
zilliztech · Dec 1, 2023 · b9dee17 · b9dee17
1 parent 47349d9
commit b9dee17
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/ci/E2E2.groovy b/ci/E2E2.groovy
@@ -1,4 +1,4 @@
-int total_timeout_minutes = 60*2
+int total_timeout_minutes = 60
 def knowhere_wheel=''
 pipeline {
     agent {
@@ -18,7 +18,6 @@ pipeline {
     }
     stages {
         stage("Build"){
-
             steps {
                 container("build"){
                     script{
@@ -31,7 +30,7 @@ pipeline {
                         sh "conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local"
                         sh "cmake --version"
                         sh "mkdir build"
-                        sh "cd build/ && conan install .. --build=missing -o with_ut=True -o with_diskann=True -s compiler.libcxx=libstdc++11 && conan build .."
+                        sh "cd build/ && conan install .. --build=missing -o with_diskann=True -s compiler.libcxx=libstdc++11 && conan build .."
                         sh "cd python && VERSION=${version} python3 setup.py bdist_wheel"
                         dir('python/dist'){
                         knowhere_wheel=sh(returnStdout: true, script: 'ls | grep .whl').trim()
@@ -68,7 +67,7 @@ pipeline {
                       sh "apt install libopenblas-dev libaio-dev libdouble-conversion-dev libevent-dev -y"
                       sh "nvidia-smi"
                       sh "pip3 install ${knowhere_wheel} \
-                          && pip3 install -r requirements.txt --timeout 30 --retries 6  && pytest -v -m 'L0 and cpu'"
+                          && pip3 install -r requirements.txt --timeout 30 --retries 6  && pytest -v -m 'L0'"
                     }
                 }
             }
@@ -81,6 +80,5 @@ pipeline {
                 }
             }
         }
-
     }
 }
diff --git a/ci/E2E_GPU.groovy b/ci/E2E_GPU.groovy
@@ -1,4 +1,4 @@
-int total_timeout_minutes = 60*2
+int total_timeout_minutes = 120
 def knowhere_wheel=''
 pipeline {
     agent {
@@ -36,7 +36,7 @@ pipeline {
                         sh "conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local"
                         sh "cmake --version"
                         sh "mkdir build"
-                        sh "cd build/ && conan install .. --build=missing -o with_ut=True -o with_diskann=True -o with_raft=True -s compiler.libcxx=libstdc++11 && conan build .."
+                        sh "cd build/ && conan install .. --build=missing -o with_diskann=True -o with_raft=True -s compiler.libcxx=libstdc++11 && conan build .."
                         sh "cd python && VERSION=${version} python3 setup.py bdist_wheel"
                         dir('python/dist'){
                         knowhere_wheel=sh(returnStdout: true, script: 'ls | grep .whl').trim()
@@ -73,7 +73,7 @@ pipeline {
                       sh "apt install libopenblas-dev libaio-dev libdouble-conversion-dev libevent-dev -y"
                       sh "nvidia-smi"
                       sh "pip3 install ${knowhere_wheel} \
-                          && pip3 install -r requirements.txt --timeout 30 --retries 6  && pytest -v -m 'L0 and gpu'"
+                          && pip3 install -r requirements.txt --timeout 30 --retries 6  && pytest -v"
                     }
                 }
             }

diff --git a/ci/UT_GPU.groovy b/ci/UT_GPU.groovy
@@ -1,4 +1,4 @@
-int total_timeout_minutes = 60*2
+int total_timeout_minutes = 120
 def knowhere_wheel=''
 pipeline {
     agent {
@@ -18,7 +18,6 @@ pipeline {
     }
     stages {
         stage("UT"){
-
             steps {
                 container("build"){
                     script{
@@ -31,9 +30,9 @@ pipeline {
                         sh "conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local"
                         sh "cmake --version"
                         sh "mkdir build"
-                        sh "cd build/ && conan install .. --build=missing -s build_type=Debug -o with_ut=True -o with_raft=True -s compiler.libcxx=libstdc++11 \
+                        sh "cd build/ && conan install .. --build=missing -s build_type=Release -o with_diskann=True -o with_ut=True -o with_raft=True -s compiler.libcxx=libstdc++11 \
                               && conan build .. \
-                              && ./Debug/tests/ut/knowhere_tests"
+                              && ./Release/tests/ut/knowhere_tests"
                     }
                 }
             }