Update whl name for CI (#408)

Signed-off-by: Jenny Li <[email protected]> Signed-off-by: Jenny Li <[email protected]>
milvus-io · Aug 18, 2022 · a9b9607 · a9b9607
1 parent 23e93b9
commit a9b9607
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/ci/GpuE2E.groovy b/ci/GpuE2E.groovy
@@ -31,10 +31,10 @@ pipeline {
                     def gitShortCommit = sh(returnStdout: true, script: "echo ${env.GIT_COMMIT} | cut -b 1-7 ").trim()  
                     version="${env.CHANGE_ID}.${date}.${gitShortCommit}"
                     sh "./build.sh -g -u -t Release"
-                    knowhere_wheel="knowhere-${version}-cp38-cp38-linux_x86_64.whl"
                     sh "cd python  && VERSION=${version} python3 setup.py bdist_wheel"
-                    dir('python'){
-                      archiveArtifacts artifacts: "dist/${knowhere_wheel}", followSymlinks: false
+                    dir('python/dist'){
+                       knowhere_wheel=sh(returnStdout: true, script: 'ls | grep .whl').trim()
+                      archiveArtifacts artifacts: "${knowhere_wheel}", followSymlinks: false
                     }
                     // stash knowhere info for rebuild E2E Test only
                     sh "echo ${knowhere_wheel} > knowhere.txt"
@@ -72,7 +72,7 @@ pipeline {
                     checkout([$class: 'GitSCM', branches: [[name: '*/main']], extensions: [], 
                     userRemoteConfigs: [[credentialsId: 'milvus-ci', url: 'https://github.com/milvus-io/knowhere-test.git']]])   
                     dir('tests'){
-                      unarchive mapping: ["dist/${knowhere_wheel}": "${knowhere_wheel}"]
+                      unarchive mapping: ["${knowhere_wheel}": "${knowhere_wheel}"]
                       sh "ls -lah"
                       sh "nvidia-smi"
                       sh "pip3 install ${knowhere_wheel} \

diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
@@ -29,10 +29,10 @@ pipeline {
                     def gitShortCommit = sh(returnStdout: true, script: "echo ${env.GIT_COMMIT} | cut -b 1-7 ").trim()  
                     version="${env.CHANGE_ID}.${date}.${gitShortCommit}"
                     sh "./build.sh -t Release"
-                    knowhere_wheel="knowhere-${version}-cp38-cp38-linux_x86_64.whl"
                     sh "cd python  && VERSION=${version} python3 setup.py bdist_wheel"
-                    dir('python'){
-                      archiveArtifacts artifacts: "dist/${knowhere_wheel}", followSymlinks: false
+                    dir('python/dist'){
+                      knowhere_wheel=sh(returnStdout: true, script: 'ls | grep .whl').trim()
+                      archiveArtifacts artifacts: "${knowhere_wheel}", followSymlinks: false
                     }
                         // stash knowhere info for rebuild E2E Test only
                     sh "echo ${knowhere_wheel} > knowhere.txt"
@@ -72,7 +72,7 @@ pipeline {
                     checkout([$class: 'GitSCM', branches: [[name: '*/main']], extensions: [], 
                     userRemoteConfigs: [[credentialsId: 'milvus-ci', url: 'https://github.com/milvus-io/knowhere-test.git']]])   
                     dir('tests'){
-                      unarchive mapping: ["dist/${knowhere_wheel}": "${knowhere_wheel}"]
+                      unarchive mapping: ["${knowhere_wheel}": "${knowhere_wheel}"]
                       sh "ls -lah"
                       sh "pip3 install ${knowhere_wheel} \
                           && pip3 install -r requirements.txt --timeout 30 --retries 6 &&  pytest -v -m 'L0 and cpu'"