CBL-5786 : Download VS Search in CI Build for testing

* Downloaded VS Search in CI Build for testing. * Disabled VS Search on Windows ARM64 for now as we don’t release it in 3.2.0 beta-3.
couchbase · May 23, 2024 · 04088f2 · 04088f2
1 parent 3795baf
commit 04088f2
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/jenkins/ci_build_unix.sh b/jenkins/ci_build_unix.sh
@@ -43,6 +43,17 @@ echo VERSION=${VERSION}
 
 ln -sf ${WORKSPACE}/couchbase-lite-c-ee/couchbase-lite-core-EE ${WORKSPACE}/couchbase-lite-c/vendor/couchbase-lite-core-EE
 
+if [[ ${EDITION} == 'enterprise'* ]]; then
+    echo "==== Download Vector Search Extension for Tests  ==="
+    pushd ${project_dir}
+    if [[ $OSTYPE == 'darwin'* ]]; then
+    ./scripts/download_vector_search_extension.sh apple
+    else
+    ./scripts/download_vector_search_extension.sh linux
+    fi
+    popd
+fi
+
 echo "====  Building macos/linux Release binary  ==="
 cd ${WORKSPACE}/build_release
 cmake -DEDITION=${EDITION} -DCMAKE_INSTALL_PREFIX=`pwd`/libcblite-$VERSION -DCMAKE_BUILD_TYPE=MinSizeRel ..

diff --git a/jenkins/ci_build_win_desktop.ps1 b/jenkins/ci_build_win_desktop.ps1
@@ -75,6 +75,12 @@ function Build() {
     Pop-Location
 }
 
+function DownloadVectorSearchExtension() {
+    Push-Location ${env:WORKSPACE}\couchbase-lite-c
+    & .\scripts\download_vector_search_extension.ps1
+    Pop-Location
+}
+
 function Run-UnitTest() {
     param(
         [Parameter(Mandatory=$true, Position = 0)][string]$directory
@@ -93,8 +99,14 @@ function Run-UnitTest() {
 $Build_Dir = "build_${Architecture}"
 Remove-Item -Recurse -Force -ErrorAction Ignore "${env:WORKSPACE}\${Build_Dir}\libcblite-${Version}"
 New-Item -Type Junction -Target ${env:WORKSPACE}/couchbase-lite-c-ee/couchbase-lite-core-EE -Path ${env:WORKSPACE}/couchbase-lite-c/vendor/couchbase-lite-core-EE
+
+if ("${Edition}" -eq "enterprise") {
+    DownloadVectorSearchExtension
+}
+
 Build "${env:WORKSPACE}\${Build_Dir}"
-if("${Edition}" -eq "enterprise") {
+
+if ("${Edition}" -eq "enterprise") {
     Run-UnitTest "${env:WORKSPACE}\${Build_Dir}"
 }
 

diff --git a/test/VectorSearchTest.cc b/test/VectorSearchTest.cc
@@ -30,10 +30,16 @@ using namespace std;
 
 #ifdef COUCHBASE_ENTERPRISE
 
-#if defined(__APPLE__) || defined(__linux__) || defined(WIN32)
+#if defined(__APPLE__) || defined(__linux__)
 #define VECTOR_SEARCH_TEST_ENABLED 1
 #endif
 
+#if defined(WIN32)
+    #if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || defined(_M_X64)
+        #define VECTOR_SEARCH_TEST_ENABLED 1
+    #endif
+#endif
+
 #ifdef VECTOR_SEARCH_TEST_ENABLED
 
 static vector<string> sVectorSearchTestLogs;