pgaftest: new test infrastructure, GitHub Actions CI, upgrade test

.gitattributes

@@ -25,3 +25,4 @@ src/bin/lib/libs/** -citus-style
 src/bin/lib/pg/** -citus-style
 src/bin/lib/subcommands.c/** -citus-style
 src/monitor/version_compat.c -citus-style
+src/bin/pgaftest/** -citus-style

.github/workflows/run-pgaftest.yml

@@ -0,0 +1,259 @@
+name: pgaftest
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+# One run per branch; cancel in-progress runs on new push.
+concurrency:
+  group: pgaftest-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  # ---------------------------------------------------------------------------
+  # Build the runtime Docker image and the pgaftest binary once, then share
+  # both as artifacts with every parallel test job.
+  # ---------------------------------------------------------------------------
+  build:
+    name: Build image & pgaftest
+    runs-on: ubuntu-latest
+    env:
+      PGVERSION: 17
+
+    steps:
+      - uses: actions/checkout@v4.2.2
+
+      # git-version.h is generated from the working tree and must exist on the
+      # host before the Docker build COPY step reads it.
+      - name: Generate git-version.h
+        run: make version
+
+      - name: Build pg_auto_failover run image
+        run: |
+          docker build \
+            --build-arg PGVERSION=${{ env.PGVERSION }} \
+            --target run \
+            -t pgaf:run \
+            .
+
+      - name: Save pgaf:run image as a tarball
+        run: docker save pgaf:run | gzip > /tmp/pgaf-run.tar.gz
+
+      - name: Upload pgaf:run image artifact
+        uses: actions/upload-artifact@v4.4.3
+        with:
+          name: pgaf-run-image
+          path: /tmp/pgaf-run.tar.gz
+          # Only needed for the duration of this workflow run.
+          retention-days: 1
+
+      # Build the full build image just to extract the pgaftest binary.
+      # The binary is linux/amd64, linked against PGDG libpq — matches
+      # ubuntu-latest runners where the test jobs will execute it.
+      - name: Build pg_auto_failover build image (for pgaftest extraction)
+        run: |
+          docker build \
+            --build-arg PGVERSION=${{ env.PGVERSION }} \
+            --target build \
+            -t pgaf:build \
+            .
+
+      - name: Extract pgaftest binary from build image
+        run: |
+          docker create --name pgaftest-extract pgaf:build
+          docker cp pgaftest-extract:/usr/lib/postgresql/${{ env.PGVERSION }}/bin/pgaftest \
+            /tmp/pgaftest-bin
+          docker rm pgaftest-extract
+          chmod +x /tmp/pgaftest-bin
+
+      - name: Upload pgaftest binary artifact
+        uses: actions/upload-artifact@v4.4.3
+        with:
+          name: pgaftest-binary
+          path: /tmp/pgaftest-bin
+          retention-days: 1
+
+  # ---------------------------------------------------------------------------
+  # Run all non-upgrade specs from tests/tap/schedule in a matrix.
+  # Each job is independent; they all share the pre-built image and binary.
+  # ---------------------------------------------------------------------------
+  test:
+    name: pgaftest / ${{ matrix.spec }}
+    needs: build
+    runs-on: ubuntu-latest
+    timeout-minutes: 25
+    strategy:
+      fail-fast: false
+      matrix:
+        spec:
+          - basic_operation
+          - basic_operation_listen_flag
+          - maintenance_and_drop
+          - create_standby_with_pgdata
+          - ensure
+          - monitor_disabled
+          - replace_monitor
+          - config_get_set
+          - skip_pg_hba
+          - auth
+          - enable_ssl
+          - ssl_cert
+          - ssl_self_signed
+          - multi_standbys
+          - multi_async
+          - multi_ifdown
+          - multi_maintenance
+          - multi_alternate
+          - extension_update
+
+    steps:
+      - uses: actions/checkout@v4.2.2
+
+      - name: Download pgaf:run image
+        uses: actions/download-artifact@v4.1.8
+        with:
+          name: pgaf-run-image
+          path: /tmp
+
+      - name: Load pgaf:run image into Docker
+        run: docker load < /tmp/pgaf-run.tar.gz
+
+      - name: Download pgaftest binary
+        uses: actions/download-artifact@v4.1.8
+        with:
+          name: pgaftest-binary
+          path: /tmp
+
+      # pgaftest links against PGDG libpq — install the matching runtime lib.
+      - name: Install libpq runtime
+        run: |
+          sudo apt-get install -y curl ca-certificates gnupg
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+            | sudo apt-key add -
+          echo "deb http://apt.postgresql.org/pub/repos/apt \
+            $(lsb_release -cs)-pgdg main" \
+            | sudo tee /etc/apt/sources.list.d/pgdg.list
+          sudo apt-get update
+          sudo apt-get install -y libpq5
+
+      - name: Run ${{ matrix.spec }}
+        timeout-minutes: 18
+        env:
+          PGAF_IMAGE: pgaf:run
+        run: |
+          chmod +x /tmp/pgaftest-bin
+          /tmp/pgaftest-bin run tests/tap/specs/${{ matrix.spec }}.pgaf
+
+  # ---------------------------------------------------------------------------
+  # installcheck: builds pgaf:testrun (run + source tree + postgresql-server-dev)
+  # and runs the SQL regression test suite via pg_regress.  Kept separate from
+  # the main matrix because it requires a larger image built inline.
+  # ---------------------------------------------------------------------------
+  installcheck:
+    name: pgaftest / installcheck
+    needs: build
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    env:
+      PGVERSION: 17
+
+    steps:
+      - uses: actions/checkout@v4.2.2
+
+      - name: Install libpq runtime
+        run: |
+          sudo apt-get install -y curl ca-certificates gnupg
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+            | sudo apt-key add -
+          echo "deb http://apt.postgresql.org/pub/repos/apt \
+            $(lsb_release -cs)-pgdg main" \
+            | sudo tee /etc/apt/sources.list.d/pgdg.list
+          sudo apt-get update
+          sudo apt-get install -y libpq5
+
+      - name: Download pgaftest binary
+        uses: actions/download-artifact@v4.1.8
+        with:
+          name: pgaftest-binary
+          path: /tmp
+
+      - name: Generate git-version.h
+        run: make version
+
+      - name: Build pgaf:testrun image
+        run: |
+          docker build \
+            --build-arg PGVERSION=${{ env.PGVERSION }} \
+            --target testrun \
+            -t pgaf:testrun \
+            .
+
+      - name: Run installcheck spec
+        timeout-minutes: 15
+        run: |
+          chmod +x /tmp/pgaftest-bin
+          /tmp/pgaftest-bin run tests/tap/specs/installcheck.pgaf
+
+  # ---------------------------------------------------------------------------
+  # Upgrade test: builds both pgaf:next (current branch) and pgaf:current
+  # (the previous release tag, auto-detected), then runs the upgrade spec.
+  # Kept separate because it needs a PGVERSION=16 image and additional
+  # build steps (pgaf:current-base from git archive of PREV_TAG).
+  # ---------------------------------------------------------------------------
+  upgrade:
+    name: pgaftest / upgrade
+    needs: build
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    env:
+      PGVERSION: 16
+
+    steps:
+      - uses: actions/checkout@v4.2.2
+        with:
+          # Full history needed so PREV_TAG auto-detection (git tag --sort)
+          # finds the correct previous release tag.
+          fetch-depth: 0
+
+      - name: Install libpq runtime
+        run: |
+          sudo apt-get install -y curl ca-certificates gnupg
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+            | sudo apt-key add -
+          echo "deb http://apt.postgresql.org/pub/repos/apt \
+            $(lsb_release -cs)-pgdg main" \
+            | sudo tee /etc/apt/sources.list.d/pgdg.list
+          sudo apt-get update
+          sudo apt-get install -y libpq5
+
+      - name: Download pgaftest binary
+        uses: actions/download-artifact@v4.1.8
+        with:
+          name: pgaftest-binary
+          path: /tmp
+
+      - name: Generate git-version.h
+        run: make version
+
+      # The build job already produced pgaf:run at PG16 for the regular tests,
+      # but the upgrade job runs independently and needs its own images.
+      # Build pgaf:next first so pgaf:current's Dockerfile.current can COPY
+      # the v2.2 binary and extension files from it.
+      - name: Build pgaf:next (current branch, PGVERSION=16)
+        run: |
+          make -C tests/upgrade pgaf-next PGVERSION=${{ env.PGVERSION }}
+
+      - name: Build pgaf:current (previous release + both binaries baked in)
+        run: |
+          make -C tests/upgrade pgaf-current PGVERSION=${{ env.PGVERSION }}
+
+      - name: Run upgrade spec
+        timeout-minutes: 25
+        run: |
+          chmod +x /tmp/pgaftest-bin
+          /tmp/pgaftest-bin run tests/tap/specs/upgrade.pgaf

.github/workflows/run-tests.yml

@@ -3,14 +3,30 @@ name: Run Tests
 on:
   push:
     branches:
-    - main
+      - main
   pull_request:
     branches:
-    - main
-
+      - main
   workflow_dispatch:
 
 jobs:
+  style_checker:
+    name: Style check
+    runs-on: ubuntu-latest
+    container: citus/stylechecker:no-py
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4.2.2
+
+      - name: Set safe directory for git
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
+      - name: Check C formatting
+        run: citus_indent --check
+
+      - name: Check banned functions
+        run: ci/banned.h.sh
+
   run_tests:
     name: Run test
     runs-on: ubuntu-latest
@@ -33,46 +49,19 @@ jobs:
         include:
           - PGVERSION: 14
             TEST: tablespaces
-          - PGVERSION: 14
-            TEST: linting
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.2.2
 
       - name: Set environment variables
         run: |
-            echo "PGVERSION=${{ matrix.PGVERSION }}" >> $GITHUB_ENV
-            echo "TEST=${{ matrix.TEST }}" >> $GITHUB_ENV
-            echo "LINTING=${{ matrix.LINTING }}" >> $GITHUB_ENV
-            echo "TRAVIS_BUILD_DIR=$(pwd)" >> $GITHUB_ENV
-
-      - name: Clone and install linting tools
-        if: ${{ env.TEST == 'linting' }}
-        run: |
-          sudo apt-get install python3-pip
-          pip3 install --user black
-          black --version
-          gcc --version
-          # Install uncrustify the Citus way
-          make -C ci -f tools.mk tools
-
-      - name: Check code formatting and banned function
-        if: ${{ env.TEST == 'linting' }}
-        run: |
-          make lint
-
-      - name: Build documentation
-        if: ${{ env.TEST == 'linting' }}
-        run: |
-          make build-docs
+          echo "PGVERSION=${{ matrix.PGVERSION }}" >> $GITHUB_ENV
+          echo "TEST=${{ matrix.TEST }}" >> $GITHUB_ENV
+          echo "TRAVIS_BUILD_DIR=$(pwd)" >> $GITHUB_ENV
 
       - name: Build Docker Test Image
-        if: ${{ env.TEST != 'linting' }}
-        run: |
-          make build-test-image
+        run: make build-test-image
 
       - name: Run Test
-        if: ${{ env.TEST != 'linting' }}
         timeout-minutes: 15
-        run: |
-          make ci-test
+        run: make ci-test

.gitignore

@@ -52,3 +52,6 @@ docs/tikz/*.png
 # Exclude our demo/test tmux directory
 tmux/
 valgrind/
+*.tmp
+src/bin/pgaftest/test_spec_parse.tab.*
+src/bin/pgaftest/test_spec_parse.output