Fix tests

couchbase · Oct 7, 2024 · 642241c · 642241c
1 parent 007e4f6
commit 642241c
Show file tree

Hide file tree

Showing 12 changed files with 356 additions and 154 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -316,8 +316,8 @@ jobs:
           - nts
           - zts
         server:
-          - 7.6.0
-          - 7.2.4
+          - 7.6.3
+          - 7.2.5
           - 7.1.6
           - 7.0.5
     steps:
@@ -331,7 +331,7 @@ jobs:
       - name: Install cbdinocluster
         run: |
           mkdir -p "$HOME/bin"
-          curl -L -o "$HOME/bin/cbdinocluster" https://github.com/couchbaselabs/cbdinocluster/releases/download/v0.0.35/cbdinocluster-linux
+          curl -L -o "$HOME/bin/cbdinocluster" https://github.com/couchbaselabs/cbdinocluster/releases/download/v0.0.52/cbdinocluster-linux-amd64
           chmod a+x "$HOME/bin/cbdinocluster"
           echo "$HOME/bin" >> $GITHUB_PATH
       - name: Initialize cbdinocluster
@@ -341,7 +341,11 @@ jobs:
         env:
           CLUSTERCONFIG: |
             nodes:
-              - count: 2
+              - count: 1
+                version: ${{ matrix.server }}
+                services:
+                  - kv
+              - count: 1
                 version: ${{ matrix.server }}
                 services:
                   - kv
@@ -358,7 +362,7 @@ jobs:
         run: |
           CLUSTER_ID=$(cbdinocluster -v allocate --def="${CLUSTERCONFIG}")
           CONNECTION_STRING=$(cbdinocluster -v connstr "${CLUSTER_ID}")
-          cbdinocluster -v buckets add ${CLUSTER_ID} default --ram-quota-mb=100 --flush-enabled=true
+          cbdinocluster -v buckets add ${CLUSTER_ID} default --ram-quota-mb=100 --flush-enabled=true --num-replicas=1
           cbdinocluster -v buckets load-sample ${CLUSTER_ID} travel-sample
           echo "CLUSTER_ID=${CLUSTER_ID}" >> "$GITHUB_ENV"
           echo "TEST_CONNECTION_STRING=${CONNECTION_STRING}?dump_configuration=true" >> "$GITHUB_ENV"

diff --git a/bin/test.rb b/bin/test.rb
@@ -68,6 +68,11 @@ def capture(*args)
   output
 end
 
+if ENV["CB_VALGRIND"]
+  ENV["USE_ZEND_ALLOC"] = 0
+  ENV["ZEND_DONT_UNLOAD_MODULES"] = 1
+end
+
 project_root = File.expand_path(File.join(__dir__, ".."))
 build_root = File.join(project_root, "build")