Install spock changes

.codacy.yaml

@@ -0,0 +1,60 @@
+exclude_paths:
+  - 'tests/regress/sql/*.sql'     # non-standard SQL files with \ directives
+  - 'sql/*.sql' # non-standard SQL files with \ directives
+
+# Ignore LOC and complexity for inherited files
+engines:
+  metric:
+    exclude_paths:
+      - "src/spock_apply.c"
+      - "src/spock_apply_heap.c"
+      - "src/spock_apply_spi.c"
+      - "src/spock.c"
+      - "src/spock_conflict.c"
+      - "src/spock_dependency.c"
+      - "src/spock_executor.c"
+      - "src/spock_fe.c"
+      - "src/spock_functions.c"
+      - "src/spock_manager.c"
+      - "src/spock_monitoring.c"
+      - "src/spock_node.c"
+      - "src/spock_output.c"
+      - "src/spock_output_config.c"
+      - "src/spock_output_plugin.c"
+      - "src/spock_output_proto.c"
+      - "src/spock_proto_json.c"
+      - "src/spock_proto_native.c"
+      - "src/spock_queue.c"
+      - "src/spock_relcache.c"
+      - "src/spock_repset.c"
+      - "src/spock_rpc.c"
+      - "src/spock_sequences.c"
+      - "src/spock_sync.c"
+      - "src/spock_worker.c"
+  lizard:
+    exclude_paths:
+      - "src/spock_apply.c"
+      - "src/spock_apply_heap.c"
+      - "src/spock_apply_spi.c"
+      - "src/spock.c"
+      - "src/spock_conflict.c"
+      - "src/spock_dependency.c"
+      - "src/spock_executor.c"
+      - "src/spock_fe.c"
+      - "src/spock_functions.c"
+      - "src/spock_manager.c"
+      - "src/spock_monitoring.c"
+      - "src/spock_node.c"
+      - "src/spock_output.c"
+      - "src/spock_output_config.c"
+      - "src/spock_output_plugin.c"
+      - "src/spock_output_proto.c"
+      - "src/spock_proto_json.c"
+      - "src/spock_proto_native.c"
+      - "src/spock_queue.c"
+      - "src/spock_relcache.c"
+      - "src/spock_repset.c"
+      - "src/spock_rpc.c"
+      - "src/spock_sequences.c"
+      - "src/spock_sync.c"
+      - "src/spock_worker.c"

.github/workflows/cache-base-image.yml

@@ -0,0 +1,176 @@
+name: Update base OS image
+run-name: Updating the base OS and install necessary extra packages (multiplatform)
+
+# This workflow builds the pgEdge base test image with full reproducibility metadata:
+# - Captures build timestamp, git commit SHA, branch, and Rocky Linux version
+# - Embeds build information in /etc/pgedge/build-info.txt within the image
+# - Tags images with both :latest and :${GIT_COMMIT} for version tracking
+# - Adds OCI labels for standard metadata inspection
+# - Prints all build metadata to workflow output for issue reproduction
+
+on:
+  workflow_dispatch:
+    inputs:
+      image_name:
+        description: 'Base image name (without registry/owner prefix)'
+        required: false
+        default: 'base-test-image'
+        type: string
+      image_tag:
+        description: 'Additional custom tag (besides :latest and :<commit-sha>)'
+        required: false
+        default: ''
+        type: string
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  pull-and-test:
+    strategy:
+      fail-fast: true
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout spock
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - name: Add permissions
+        run: |
+          sudo chmod -R a+w ${GITHUB_WORKSPACE}
+
+      # See https://github.com/orgs/community/discussions/27086
+      - name: set lower case owner name
+        run: |
+          echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV}
+        env:
+          OWNER: '${{ github.repository_owner }}'
+
+      # Capture build metadata for reproducibility
+      - name: Capture build metadata
+        id: meta
+        run: |
+          echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> ${GITHUB_ENV}
+          echo "GIT_COMMIT=$(git rev-parse HEAD)" >> ${GITHUB_ENV}
+          echo "GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> ${GITHUB_ENV}
+          echo "ROCKYLINUX_VERSION=$(docker run --rm rockylinux:9 cat /etc/rocky-release)" >> ${GITHUB_ENV}
+          echo "IMAGE_NAME=${{ inputs.image_name || 'base-test-image' }}" >> ${GITHUB_ENV}
+
+          # Print build information
+          echo "========================================="
+          echo "pgEdge Base Image Build Information"
+          echo "========================================="
+          echo "Image Name: ${{ inputs.image_name || 'base-test-image' }}"
+          echo "Custom Tag: ${{ inputs.image_tag }}"
+          echo "Build Date: $(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+          echo "Git Commit: $(git rev-parse HEAD)"
+          echo "Git Branch: $(git rev-parse --abbrev-ref HEAD)"
+          echo "Rocky Linux: $(docker run --rm rockylinux:9 cat /etc/rocky-release)"
+          echo "Platforms: linux/amd64, linux/arm64"
+          echo "========================================="
+
+      # Set up QEMU for multiplatform builds
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Set up Docker Buildx
+        # Codacy wants us to use full commit SHA. This is for v3
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      # Login to GHCR
+      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
+        with:
+          registry: ghcr.io
+          username: $OWNER_LC
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Prepare cached version of the base image with build metadata
+      - name: Build and push multiplatform base system image
+        uses: docker/build-push-action@c382f710d39a5bb4e430307530a720f50c2d3318
+        with:
+          context: .
+          file: tests/docker/Dockerfile-base.el9
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:latest
+            ghcr.io/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:${{ env.GIT_COMMIT }}
+            ${{ inputs.image_tag && format('ghcr.io/{0}/{1}:{2}', env.OWNER_LC, env.IMAGE_NAME, inputs.image_tag) || '' }}
+          build-args: |
+            BUILD_DATE=${{ env.BUILD_DATE }}
+            GIT_COMMIT=${{ env.GIT_COMMIT }}
+            GIT_BRANCH=${{ env.GIT_BRANCH }}
+            ROCKYLINUX_VERSION=${{ env.ROCKYLINUX_VERSION }}
+          cache-from: type=gha,scope=base
+          cache-to: type=gha,mode=max,scope=base
+          provenance: false
+          sbom: false
+
+      # Verify multiplatform manifest
+      - name: Inspect multiplatform manifest
+        run: |
+          docker buildx imagetools inspect ghcr.io/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:latest
+
+      # Verify and display build information from the image
+      - name: Display build information
+        run: |
+          echo ""
+          echo "========================================="
+          echo "Multiplatform Image Built Successfully!"
+          echo "========================================="
+          echo "Image Name: ${{ env.IMAGE_NAME }}"
+          echo "Platforms: linux/amd64, linux/arm64"
+          echo ""
+          echo "Image Tags:"
+          echo "  - ghcr.io/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:latest"
+          echo "  - ghcr.io/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:${{ env.GIT_COMMIT }}"
+          if [ -n "${{ inputs.image_tag }}" ]; then
+            echo "  - ghcr.io/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:${{ inputs.image_tag }}"
+          fi
+          echo ""
+          echo "To pull this specific build:"
+          echo "  docker pull ghcr.io/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:${{ env.GIT_COMMIT }}"
+          echo ""
+          echo "Docker will automatically select the correct architecture:"
+          echo "  - linux/amd64 for Intel/AMD systems"
+          echo "  - linux/arm64 for Apple Silicon Macs (M1/M2/M3/M4)"
+          echo ""
+          echo "To view build info from the image:"
+          echo "  docker run --rm ghcr.io/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:latest cat /etc/pgedge/build-info.txt"
+          echo ""
+          echo "To inspect image labels:"
+          echo "  docker inspect ghcr.io/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:latest | jq '.[0].Config.Labels'"
+          echo "========================================="
+
+# ==============================================================================
+# Build Complete!
+# ==============================================================================
+# The base image is available at:
+#   https://github.com/pgedge/spock/pkgs/container/<image-name>
+#
+# Workflow Inputs (configurable through Actions UI):
+#   - image_name: Base image name (default: 'base-test-image')
+#   - image_tag: Optional custom tag in addition to :latest and :<commit-sha>
+#
+# Each build includes comprehensive reproducibility metadata:
+#   1. /etc/pgedge/build-info.txt - Embedded build information file
+#   2. OCI image labels with build timestamp, commit SHA, and branch
+#   3. Commit-specific tag (:<commit-sha>) for immutable references
+#   4. Optional custom tag (:<custom-tag>) if provided
+#   5. Workflow output with all build parameters
+#
+# To reproduce any build:
+#   1. Check workflow output or image labels for git commit SHA
+#   2. Checkout that commit: git checkout <sha>
+#   3. Run the docker build command shown in /etc/pgedge/build-info.txt
+#
+# Documentation: tests/docker/Dockerfile-base.md
+# ==============================================================================

.github/workflows/spockbench.yml

@@ -1,6 +1,10 @@
 name: Regression Tests and Spockbench
 run-name: Running Regression Tests and Spockbench
-on: [push]
+
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize, reopened]
 
 permissions:
   contents: read
@@ -11,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        pgver: [15, 16, 17]
+        pgver: [15, 16, 17, 18]
 
     runs-on: ${{ matrix.os }}
 
@@ -25,7 +29,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: pgedge/spockbench
-          token: ${{ secrets.READ_SPOCKBENCH_PAT }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           path: spockbench
           ref: master
 
@@ -34,35 +38,79 @@ jobs:
           sudo chmod -R a+w ${GITHUB_WORKSPACE}
 
       - name: Set up Docker
-        uses: docker/setup-buildx-action@v3
+        # Codacy wants us to use full commit SHA. This is for v3
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
 
       - name: Set up docker compose
-        uses: docker/setup-compose-action@v1
+        # Codacy wants us to use full commit SHA. This is for v1
+        uses: docker/setup-compose-action@364cc21a5de5b1ee4a7f5f9d3fa374ce0ccde746 # v1
         with:
           version: latest
 
       - name: Build docker container
         run: |
-          cd ${GITHUB_WORKSPACE}/tests/
-          echo PG_VER=${{ matrix.pgver }} >> pgedge.env
+          cd ${GITHUB_WORKSPACE}/
           docker build \
             --build-arg PGVER=${{ matrix.pgver }} \
-            --build-arg GITHUB_REF=${{ github.ref_name }} \
-            --build-arg REPO_URL=https://github.com/${{ github.repository }} \
-            -t spock -f Dockerfile.el9 .
+            -t spock -f tests/docker/Dockerfile-step-1.el9 .
 
       - name: Run regression tests
         run: |
-          docker run -e PGVER=${{ matrix.pgver }} spock /home/pgedge/run-spock-regress.sh
+          REG_CT_NAME="spock-regress-${{ matrix.pgver }}-${{ github.run_id }}-${{ github.run_attempt }}"
+          echo "REG_CT_NAME=$REG_CT_NAME" >> "$GITHUB_ENV"
+          docker run --name "$REG_CT_NAME" -e PGVER=${{ matrix.pgver }} spock /home/pgedge/run-spock-regress.sh
+        timeout-minutes: 15
+
+      - name: Collect regression artifacts (from container)
+        if: ${{ always() }}
+        run: |
+          docker cp "$REG_CT_NAME":/home/pgedge/spock/tests/regress/regression_output "${GITHUB_WORKSPACE}/tests/regress/" || true
+          docker rm -f "$REG_CT_NAME" || true
+
+      - name: Upload regression artifacts
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: regress-${{ matrix.pgver }}
+          path: |
+            tests/regress/regression_output/**
+          if-no-files-found: ignore
+          retention-days: 7
+
+      - name: Run TAP tests
+        run: |
+          TAP_CT_NAME="spock-tap-${{ matrix.pgver }}-${{ github.run_id }}-${{ github.run_attempt }}"
+          echo "TAP_CT_NAME=$TAP_CT_NAME" >> "$GITHUB_ENV"
+          docker run --name "$TAP_CT_NAME" -e PGVER=${{ matrix.pgver }} --workdir=/home/pgedge/spock/tests/tap \
+            spock /home/pgedge/spock/tests/tap/run_tests.sh
+        timeout-minutes: 15
+
+      - name: Collect TAP artifacts (from container)
+        if: ${{ always() }}
+        run: |
+          docker cp "$TAP_CT_NAME":/home/pgedge/spock/tests/tap/logs "${GITHUB_WORKSPACE}/tests/tap/logs" || true
+          docker cp "$TAP_CT_NAME":/home/pgedge/spock/tests/logs "${GITHUB_WORKSPACE}/tests/logs" || true
+          docker rm -f "$TAP_CT_NAME" || true
+
+      - name: Upload TAP artifacts
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: tap-${{ matrix.pgver }}
+          path: |
+            tests/tap/logs/**
+            tests/logs/**
+          if-no-files-found: ignore
+          retention-days: 7
 
       - name: Start docker
         run: |
-          cd ${GITHUB_WORKSPACE}/tests/
+          cd ${GITHUB_WORKSPACE}/tests/docker/
           echo PG_VER=${{ matrix.pgver }} >> pgedge.env
           docker compose up
 
       - name: Check spockbench output
         run: |
-          cd ${GITHUB_WORKSPACE}/tests
+          cd ${GITHUB_WORKSPACE}/tests/docker
           ./check-outputs.sh