Merge branch 'master' into KU-1744/batching

.github/workflows/k8s-snap-integration.yaml

@@ -0,0 +1,73 @@
+name: Integration Test K8s-snap
+
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build K8-dqlite
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checking out repo
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.8"
+      - name: Install tox
+        run: pip install tox
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.21"
+      - name: Download latest k8s-snap
+        run: |
+          sudo snap download k8s --channel=latest/edge --basename k8s
+      - name: Install lxd
+        run: |
+          sudo snap refresh lxd --channel 5.21/stable
+          sudo lxd init --auto
+          sudo usermod --append --groups lxd $USER
+          sg lxd -c 'lxc version'
+      - name: Build k8s-dqlite
+        run: |
+          make static
+      - name: Unpack Snap
+        run: |
+          sudo unsquashfs -d snap-unpack-dir k8s.snap
+      - name: Replace k8s-dqlite binary
+        run: |
+          sudo cp ./bin/static/k8s-dqlite snap-unpack-dir/bin/k8s-dqlite
+          sudo chmod o+r snap-unpack-dir/bin/k8s-dqlite
+      - name: Repack Snap
+        run: |
+          sudo mksquashfs snap-unpack-dir k8s-updated.snap -noappend -comp lzo -no-fragments
+      - name: Running
+        env:
+          TEST_SNAP: ${{ github.workspace }}/k8s-updated.snap
+          TEST_SUBSTRATE: lxd
+          TEST_LXD_IMAGE: ubuntu:22.04
+          TEST_INSPECTION_REPORTS_DIR: ${{ github.workspace }}/inspection-reports
+        run: |
+          git clone https://github.com/canonical/k8s-snap.git      
+          cd k8s-snap/tests/integration && sg lxd -c 'tox -e integration'
+      - name: Prepare inspection reports
+        if: failure()
+        run: |
+          tar -czvf inspection-reports.tar.gz -C ${{ github.workspace }} inspection-reports
+      - name: Upload inspection report artifact
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: inspection-reports
+          path: ${{ github.workspace }}/inspection-reports.tar.gz

docs/development.md

@@ -55,17 +55,15 @@ and connect to the Dqlite database.
 
 Follow the guide for MicroK8s steps 1-5 while changing the snap name to `k8s`.
 
-Step 5:
-Stop k8s-dqlite included in the snap:
+5. Stop k8s-dqlite included in the snap:
 
-    ```bash
+    ```
     sudo snap stop k8s.k8s-dqlite --disable
     ```
 
-Step 6:
-This step is different as it uses a different path for the storage directory and the listen address:
+6. This step is different as it uses a different path for the storage directory and the listen address:
 
-    ```bash
+    ```
     cd k8s-dqlite
     make static
     sudo ./bin/static/k8s-dqlite \