x

.github/workflows/main.yml

@@ -318,13 +318,91 @@ jobs:
             args: backend=bitcoind dbbackend=sqlite
           - name: bitcoind-sqlite-nativesql
             args: backend=bitcoind dbbackend=sqlite nativesql=true
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: fetch and rebase on ${{ github.base_ref }}
+        if: github.event_name == 'pull_request'
+        uses: ./.github/actions/rebase
+
+      - name: setup go ${{ env.GO_VERSION }}
+        uses: ./.github/actions/setup-go
+        with:
+          go-version: '${{ env.GO_VERSION }}'
+          key-prefix: integration-test
+
+      - name: install bitcoind
+        run: ./scripts/install_bitcoind.sh $BITCOIN_VERSION
+
+      - name: run ${{ matrix.name }}
+        run: make itest-parallel tranches=${{ env.SMALL_TRANCHES }} ${{ matrix.args }} shuffleseed=${{ github.run_id }}${{ strategy.job-index }}
+
+      - name: Send coverage
+        if: ${{ contains(matrix.args, 'cover=1') }}
+        uses: shogo82148/actions-goveralls@v1
+        with:
+          path-to-profile: coverage.txt
+          flag-name: 'itest-${{ matrix.name }}'
+          parallel: true
+
+      - name: Zip log files on failure
+        if: ${{ failure() }}
+        timeout-minutes: 5 # timeout after 5 minute
+        run: 7z a logs-itest-${{ matrix.name }}.zip itest/**/*.log
+
+      - name: Upload log files on failure
+        uses: actions/upload-artifact@v3
+        if: ${{ failure() }}
+        with:
+          name: logs-itest-${{ matrix.name }}
+          path: logs-itest-${{ matrix.name }}.zip
+          retention-days: 5
+
+  ########################
+  # run postgres integration tests with SMALL_TRANCHES
+  ########################
+  postgres-integration-test:
+    name: postgres itests
+    runs-on: ubuntu-latest
+    # Docker Hub image that `container-job` executes in
+    container: node:20-bookworm-slim
+
+    if: '!contains(github.event.pull_request.labels.*.name, ''no-itest'')'
+
+    strategy:
+      # Allow other tests in the matrix to continue if one fails.
+      fail-fast: false
+      matrix:
+        include:
           - name: bitcoind-postgres
             args: backend=bitcoind dbbackend=postgres
           - name: bitcoind-postgres-nativesql
             args: backend=bitcoind dbbackend=postgres nativesql=true
+
+    # Service containers to run with `container-job`
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image
+        image: postgres
+        # Provide the password for postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6432:5432
+
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -366,6 +444,8 @@ jobs:
           retention-days: 5
 
 
+
+
   ########################
   # run windows integration test
   ########################

Makefile

@@ -190,28 +190,6 @@ scratch: build
 check: unit itest
 
 db-instance:
-ifeq ($(dbbackend),postgres)
-	# Remove a previous postgres instance if it exists.
-	docker rm lnd-postgres --force || echo "Starting new postgres container"
-
-	# Start a fresh postgres instance. Allow a maximum of 500 connections so
-	# that multiple lnd instances with a maximum number of connections of 20
-	# each can run concurrently. Note that many of the settings here are
-	# specifically for integration testing and are not fit for running
-	# production nodes. The increase in max connections ensures that there
-	# are enough entries allocated for the RWConflictPool to allow multiple
-	# conflicting transactions to track serialization conflicts. The
-	# increase in predicate locks and locks per transaction is to allow the
-	# queries to lock individual rows instead of entire tables, helping
-	# reduce serialization conflicts. Disabling sequential scan for small
-	# tables also helps prevent serialization conflicts by ensuring lookups
-	# lock only relevant rows in the index rather than the entire table.
-	docker run --name lnd-postgres -e POSTGRES_PASSWORD=postgres -p 6432:5432 -d postgres:13-alpine -N 1500 -c max_pred_locks_per_transaction=1024 -c max_locks_per_transaction=128 -c enable_seqscan=off
-	docker logs -f lnd-postgres >itest/postgres.log 2>&1 &
-
-	# Wait for the instance to be started.
-	sleep $(POSTGRES_START_DELAY)
-endif
 
 clean-itest-logs:
 	rm -rf itest/*.log itest/.logs-*

scripts/build_postgres.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Get all the variables.
+PROCESSES=$1
+TRANCHES=$2
+SHUFFLE_SEED=$3
+
+
+# Remove a previous postgres instance if it exists.
+containers = $(docker ps --filter name=lnd-postgres* -aq) 
+docker rm containers --force --volumes || echo "Starting new postgres container"
+
+# Start a fresh postgres instance. Allow a maximum of 500 connections so that
+# multiple lnd instances with a maximum number of connections of 20 each can
+# run concurrently. Note that many of the settings here are specifically for
+# integration testing and are not fit for running production nodes. The
+# increase in max connections ensures that there are enough entries allocated
+# for the RWConflictPool to allow multiple conflicting transactions to track
+# serialization conflicts. The increase in predicate locks and locks per
+# transaction is to allow the queries to lock individual rows instead of entire
+# tables, helping reduce serialization conflicts. Disabling sequential scan for
+# small tables also helps prevent serialization conflicts by ensuring lookups
+# lock only relevant rows in the index rather than the entire table.
+docker run --name lnd-postgres -e POSTGRES_PASSWORD=postgres -p 6432:5432 -d postgres:13-alpine -N 1500 -c max_pred_locks_per_transaction=1024 -c max_locks_per_transaction=128 -c enable_seqscan=off
+docker logs -f lnd-postgres >itest/postgres.log 2>&1 &
+
+# Wait for the instance to be started.
+sleep $(POSTGRES_START_DELAY)
+