From 6df030cc59c4e31b97efbe646eb32c4f7b434e8f Mon Sep 17 00:00:00 2001
From: Ed Espino <espino@apache.org>
Date: Wed, 27 Nov 2024 22:15:31 -0800
Subject: [PATCH] test: Add single-node test configurations to CI pipeline

* Add three new test configurations for single-node testing:
  - ic-singlenode_regress
  - ic-singlenode_isolation
  - ic-singlenode_isolation2
* Update build workflow to support tests with configurable number of
  primary-mirror pairs
* Add new test configurations to required checks in .asf.yaml
* Fix path quoting in demo cluster creation script
---
 .asf.yaml                              |  3 +++
 .github/workflows/build-cloudberry.yml | 27 +++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 04618bee512..f637517f0b3 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -88,6 +88,9 @@ github:
         - RPM Install Test Apache Cloudberry
         - ic-good-opt-off
         - ic-expandshrink
+        - ic-singlenode_regress
+        - ic-singlenode_isolation
+        - ic-singlenode_isolation2
         - Generate Apache Cloudberry Build Report
 
       # Pull request review requirements
diff --git a/.github/workflows/build-cloudberry.yml b/.github/workflows/build-cloudberry.yml
index ecb19067d06..5da4d7c97fc 100644
--- a/.github/workflows/build-cloudberry.yml
+++ b/.github/workflows/build-cloudberry.yml
@@ -625,18 +625,35 @@ jobs:
     strategy:
       fail-fast: false  # Continue with other tests if one fails
       matrix:
-        test: [ic-good-opt-off, ic-expandshrink]
+        test:
+          - ic-good-opt-off
+          - ic-expandshrink
+          - ic-singlenode_regress
+          - ic-singlenode_isolation
+          - ic-singlenode_isolation2
         include:
           - test: ic-good-opt-off
             make_target: installcheck-good
             make_directory: --directory=src/test/regress
+            num_primary_mirror_pairs: 3
             pg_settings:
               optimizer: "off"
           - test: ic-expandshrink
             make_target: installcheck-expandshrink
             make_directory: --directory=src/test/isolation2
-            pg_settings:
-              optimizer: "off"
+            num_primary_mirror_pairs: 3
+          - test: ic-singlenode_regress
+            make_target: installcheck-singlenode
+            make_directory: --directory=src/test/singlenode_regress
+            num_primary_mirror_pairs: 0
+          - test: ic-singlenode_isolation
+            make_target: installcheck-singlenode
+            make_directory: --directory=src/test/isolation
+            num_primary_mirror_pairs: 0
+          - test: ic-singlenode_isolation2
+            make_target: installcheck-singlenode
+            make_directory: --directory=src/test/singlenode_isolation2
+            num_primary_mirror_pairs: 0
 
     container:
       image: apache/incubator-cloudberry:cbdb-build-rocky9-latest
@@ -874,8 +891,8 @@ jobs:
         set -eo pipefail
 
         {
-          chmod +x ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh
-          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
+          chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && NUM_PRIMARY_MIRROR_PAIRS='${{ matrix.num_primary_mirror_pairs }}' SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
             echo "::error::Demo cluster creation failed"
             exit 1
           fi