Implement H2-first CI strategy with workflow dependencies

.github/workflows/cockroachdb-testing.yml

@@ -0,0 +1,82 @@
+# This workflow runs only CockroachDB integration tests using TestContainers.
+# It disables all other database integration tests to focus on CockroachDB testing.
+# TestContainers automatically manages the CockroachDB container lifecycle.
+# This workflow only runs after the Main CI workflow succeeds.
+name: CockroachDB Integration Tests
+
+on:
+  workflow_run:
+    workflows: ["Main CI"]
+    types:
+      - completed
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:  # Allow manual triggering
+
+jobs:
+  cockroachdb-tests:
+    name: CockroachDB Integration Tests
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
+
+    permissions:
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        java-version: [ 11, 17, 21, 22 ]
+
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 22 for build
+        uses: actions/setup-java@v4
+        with:
+          java-version: 22
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build and Install (ojp-grpc-commons) with JDK 22
+        run: mvn clean install -pl ojp-grpc-commons -am -DskipTests -Dgpg.skip=true
+
+      - name: Test (ojp-grpc-commons) with JDK 22
+        run: mvn test -pl ojp-grpc-commons -Dgpg.skip=true
+
+      - name: Build (ojp-server) with JDK 22
+        run: mvn clean install -pl ojp-server -am -DskipTests -Dgpg.skip=true
+
+      - name: Test and Run (ojp-server)
+        run: |
+          nohup java -jar ojp-server/target/ojp-server-0.2.1-snapshot-shaded.jar > /tmp/ojp-server.log 2>&1 &
+          echo $! > /tmp/ojp-server.pid
+
+      - name: Wait for ojp-server to start
+        run: sleep 10
+
+      - name: Set up JDK ${{ matrix.java-version }} for ojp-jdbc-driver
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build (ojp-jdbc-driver) with JDK ${{ matrix.java-version }}
+        run: mvn clean install -pl ojp-jdbc-driver -am -DskipTests -Dgpg.skip=true
+
+      - name: Run CockroachDB Integration Tests
+        run: |
+          mvn test -pl ojp-jdbc-driver -Dgpg.skip=true \
+            -DenableCockroachDBTests=true \
+            -DdisablePostgresTests=true \
+            -DdisableMySQLTests=true \
+            -DdisableMariaDBTests=true \
+            -Dtest="CockroachDB*"
+
+      - name: Show ojp-server.log
+        if: always()  # ensures it runs even if previous steps fail
+        run: cat /tmp/ojp-server.log || echo "/tmp/ojp-server.log not found"

.github/workflows/db2-testing.yml

@@ -0,0 +1,102 @@
+# This workflow runs only DB2 integration tests using TestContainers.
+# It disables all other database integration tests to focus on DB2 testing.
+# TestContainers automatically manages the DB2 container lifecycle.
+# This workflow only runs after the Main CI workflow succeeds.
+name: DB2 Integration Tests
+
+on:
+  workflow_run:
+    workflows: ["Main CI"]
+    types:
+      - completed
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:  # Allow manual triggering
+
+jobs:
+  db2-tests:
+    name: DB2 Integration Tests
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
+
+    permissions:
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        java-version: [ 11, 17, 21, 22 ]
+
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Add DB2 JDBC Driver to ojp-server
+        run: |
+          # Create temporary file with DB2 JDBC dependency
+          cat > /tmp/db2-dep.txt << 'EOF'
+          <!-- DB2 JDBC Driver (added by CI) -->
+          <dependency>
+              <groupId>com.ibm.db2</groupId>
+              <artifactId>jcc</artifactId>
+              <version>11.5.9.0</version>
+          </dependency>
+          EOF
+
+          # Insert after the placeholder comment
+          sed -i '/<!-- PROPRIETARY DATABASE DRIVERS PLACEHOLDER -->/r /tmp/db2-dep.txt' ojp-server/pom.xml
+
+          # Verify the insertion
+          echo "=== Modified ojp-server/pom.xml dependencies section ==="
+          sed -n '/PROPRIETARY DATABASE DRIVERS PLACEHOLDER/,/HikariCP/p' ojp-server/pom.xml
+
+      - name: Set up JDK 22 for build
+        uses: actions/setup-java@v4
+        with:
+          java-version: 22
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build and Install (ojp-grpc-commons) with JDK 22
+        run: mvn clean install -pl ojp-grpc-commons -am -DskipTests -Dgpg.skip=true
+
+      - name: Test (ojp-grpc-commons) with JDK 22
+        run: mvn test -pl ojp-grpc-commons -Dgpg.skip=true
+
+      - name: Build (ojp-server) with JDK 22
+        run: mvn clean install -pl ojp-server -am -DskipTests -Dgpg.skip=true
+
+      - name: Test and Run (ojp-server)
+        run: |
+          nohup java -jar ojp-server/target/ojp-server-0.2.1-snapshot-shaded.jar > /tmp/ojp-server.log 2>&1 &
+          echo $! > /tmp/ojp-server.pid
+
+      - name: Wait for ojp-server to start
+        run: sleep 10
+
+      - name: Set up JDK ${{ matrix.java-version }} for ojp-jdbc-driver
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build (ojp-jdbc-driver) with JDK ${{ matrix.java-version }}
+        run: mvn clean install -pl ojp-jdbc-driver -am -DskipTests -Dgpg.skip=true
+
+      - name: Run DB2 Integration Tests
+        run: |
+          mvn test -pl ojp-jdbc-driver -Dgpg.skip=true \
+            -DenableDb2Tests=true \
+            -DdisablePostgresTests=true \
+            -DdisableMySQLTests=true \
+            -DenableMariaDBTests=false \
+            -DenableCockroachDBTests=false \
+            -Dtest="Db2*"
+
+      - name: Show ojp-server.log
+        if: always()  # ensures it runs even if previous steps fail
+        run: cat /tmp/ojp-server.log || echo "/tmp/ojp-server.log not found"

.github/workflows/main.yml

@@ -1,5 +1,6 @@
 # This workflow builds and tests the project on pushes and pull requests to the main branch.
-# It uses a Postgres service for integration tests and skips the CI if the commit message contains '[skip ci]'.
+# It uses services for MySQL and MariaDB integration tests.
+# PostgreSQL, Oracle, SQL Server, DB2, and CockroachDB tests are run in separate workflows using TestContainers.
 # The workflow result is reported in the Actions tab of the repository.
 name: Main CI
 
@@ -36,21 +37,6 @@ jobs:
         ports:
           - 3307:3306
 
-      mysql:
-        image: mysql:8.0
-        env:
-          MYSQL_DATABASE: defaultdb
-          MYSQL_USER: testuser
-          MYSQL_PASSWORD: testpassword
-          MYSQL_ROOT_PASSWORD: rootpassword
-        options: >-
-          --health-cmd "mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=5
-        ports:
-          - 3306:3306
-
       #TODO maybe put proprietary DBs in separated workflows, seem to be insufficient memory in github to run all at once
       #oracle:
       #  image: gvenzl/oracle-xe:21-slim
@@ -114,28 +100,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Start CockroachDB
-        run: |
-          docker run --name ojp-cockroachdb -p 26257:26257 -p 8080:8080 -d cockroachdb/cockroach:v24.3.4 start-single-node --insecure
-          # Wait for CockroachDB to be ready
-          timeout 60 bash -c 'until curl -f http://localhost:8080/health?ready=1 2>/dev/null; do sleep 2; done'
-
-      - name: Start Postgres
-        run: |
-          docker run --name ojp-postgres \
-            -e POSTGRES_USER=testuser \
-            -e POSTGRES_PASSWORD=testpassword \
-            -e POSTGRES_DB=defaultdb \
-            -p 5432:5432 \
-            -d postgres:17 \
-            -c max_prepared_transactions=100
-
-          # Wait for Postgres to become ready (up to 60s)
-          timeout 60 bash -c 'until docker exec ojp-postgres pg_isready -U testuser -d defaultdb -h 127.0.0.1; do sleep 2; done'
-
-          # Verify setting (should print 100)
-          PGPASSWORD=testpassword psql -h 127.0.0.1 -U testuser -d defaultdb -c "SHOW max_prepared_transactions;"
-
       - name: Set up JDK 22 for build
         uses: actions/setup-java@v4
         with:
@@ -171,7 +135,7 @@ jobs:
         run: mvn clean install -pl ojp-jdbc-driver -am -DskipTests -Dgpg.skip=true
 
       - name: Test (ojp-jdbc-driver)
-        run: mvn test -pl ojp-jdbc-driver -Dgpg.skip=true
+        run: mvn test -pl ojp-jdbc-driver -Dgpg.skip=true -DenableH2Tests=true -DenableMySQLTests=false -DenablePostgresTests=false -DenableCockroachDBTests=false
 
       - name: Show ojp-server.log
         if: always()  # ensures it runs even if previous steps fail

.github/workflows/mariadb-testing.yml

@@ -0,0 +1,82 @@
+# This workflow runs only MariaDB integration tests using TestContainers.
+# It disables all other database integration tests to focus on MariaDB testing.
+# TestContainers automatically manages the MariaDB container lifecycle.
+# This workflow only runs after the Main CI workflow succeeds.
+name: MariaDB Integration Tests
+
+on:
+  workflow_run:
+    workflows: ["Main CI"]
+    types:
+      - completed
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:  # Allow manual triggering
+
+jobs:
+  mariadb-tests:
+    name: MariaDB Integration Tests
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
+
+    permissions:
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        java-version: [ 11, 17, 21, 22 ]
+
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 22 for build
+        uses: actions/setup-java@v4
+        with:
+          java-version: 22
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build and Install (ojp-grpc-commons) with JDK 22
+        run: mvn clean install -pl ojp-grpc-commons -am -DskipTests -Dgpg.skip=true
+
+      - name: Test (ojp-grpc-commons) with JDK 22
+        run: mvn test -pl ojp-grpc-commons -Dgpg.skip=true
+
+      - name: Build (ojp-server) with JDK 22
+        run: mvn clean install -pl ojp-server -am -DskipTests -Dgpg.skip=true
+
+      - name: Test and Run (ojp-server)
+        run: |
+          nohup java -jar ojp-server/target/ojp-server-0.2.1-snapshot-shaded.jar > /tmp/ojp-server.log 2>&1 &
+          echo $! > /tmp/ojp-server.pid
+
+      - name: Wait for ojp-server to start
+        run: sleep 10
+
+      - name: Set up JDK ${{ matrix.java-version }} for ojp-jdbc-driver
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build (ojp-jdbc-driver) with JDK ${{ matrix.java-version }}
+        run: mvn clean install -pl ojp-jdbc-driver -am -DskipTests -Dgpg.skip=true
+
+      - name: Run MariaDB Integration Tests
+        run: |
+          mvn test -pl ojp-jdbc-driver -Dgpg.skip=true \
+            -DenableMariaDBTests=true \
+            -DenablePostgresTests=false \
+            -DenableMySQLTests=false \
+            -DdisableCockroachDBTests=true \
+            -Dtest="MariaDB*,Blob*,BasicCrud*"
+
+      - name: Show ojp-server.log
+        if: always()  # ensures it runs even if previous steps fail
+        run: cat /tmp/ojp-server.log || echo "/tmp/ojp-server.log not found"

.github/workflows/multinode-integration.yml

@@ -1,10 +1,14 @@
 # This workflow tests multinode functionality with two OJP server instances
 # It starts a Postgres database and two OJP servers on different ports,
 # then runs integration tests for multinode scenarios including failover and recovery.
+# This workflow only runs after the Main CI workflow succeeds.
 name: Multinode Integration Tests
 
 on:
-  push:
+  workflow_run:
+    workflows: ["Main CI"]
+    types:
+      - completed
     branches: [ main ]
   pull_request:
     branches: [ main ]
@@ -13,6 +17,7 @@ jobs:
   multinode-test:
     name: Multinode Integration Test
     runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'pull_request' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
 
     steps:
       - name: Git checkout