Simplify workflow tests

Author: juledwar

.github/workflows/tests.yml

@@ -3,97 +3,24 @@ name: Run parallel tests
 on: [push, pull_request]
 
 jobs:
-  docker-tests:
-    name: Docker Tests / Python ${{ matrix.python-version }}
+  test:
+    name: Tests / Python ${{ matrix.python-version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v3
-
       - name: Set up Python
         uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
-
+      - uses: gacts/install-podman@v1
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install hatch
-
-      - name: Install Docker CE
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            ca-certificates \
-            curl \
-            gnupg \
-            lsb-release
-          sudo mkdir -p /etc/apt/keyrings
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-          echo \
-            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
-            $(lsb_release -cs) stable" | \
-            sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-          sudo apt-get update
-          sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-          sudo systemctl start docker
-          docker --version
-
-      - name: Run Docker scenario tests
-        run: |
-          hatch run ci -- dbtesttools.tests.test_pgfixture_docker dbtesttools.tests.test_isolation
-
-  podman-tests:
-    name: Podman Tests / Python ${{ matrix.python-version }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Python
-        uses: actions/setup-python@v3
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install hatch
-
-      - name: Install Podman
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y podman
-          podman --version
-
-      - name: Start Podman API (rootless)
-        run: |
-          export XDG_RUNTIME_DIR="/run/user/$(id -u)"
-          sudo mkdir -p "$XDG_RUNTIME_DIR"
-          sudo chown $(id -u):$(id -g) "$XDG_RUNTIME_DIR"
-          mkdir -p "$XDG_RUNTIME_DIR"
-          nohup podman system service --time=0 unix://$XDG_RUNTIME_DIR/podman/podman.sock > podman-api.log 2>&1 &
-          echo "Waiting for podman.sock..."
-          for i in {1..10}; do
-            if podman info > /dev/null 2>&1; then
-              echo "Podman is up"
-              break
-            fi
-            sleep 2
-          done
-          cat podman-api.log
-          if ! podman info > /dev/null 2>&1; then
-            echo "::error ::Podman API service failed to start"
-            cat podman-api.log
-            exit 1
-          fi
-
-      - name: Run Podman scenario tests
+      - name: Run tests
         run: |
-          hatch run ci -- dbtesttools.tests.test_pgfixture_podman dbtesttools.tests.test_isolation
+          hatch run ci

README.rst

@@ -94,12 +94,13 @@ PG containers. You will need to do up to two extra things:
 
 If you want to use Podman instead of Docker engine you will need to follow
 these steps:
-1. Enable and start podman on your host
-```bash
-systemctl --user enable podman
-systemctl --user start podman
-```
-2. `export DBTESTTOOLS_USE_PODMAN=1` variable. 
+
+    1. Enable and start podman on your host
+    ```bash
+    systemctl --user enable podman
+    systemctl --user start podman
+    ```
+    2. `export DBTESTTOOLS_USE_PODMAN=1` variable.
 
 This code has been in use daily on a large project at Cisco for a few years
 now, and is very stable.