ci: test on different architectures

.github/workflows/push.yaml

@@ -15,94 +15,18 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  binaries:
-    name: Build concierge
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the code
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-
-      - name: Setup Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: "go.mod"
-
-      - name: Run tests
-        run: |
-          go test -v -race ./...
-
-      - name: Setup goreleaser
-        run: |
-          sudo snap install --classic goreleaser
-
-      - name: Build concierge
-        id: build
-        run: |
-          goreleaser build --clean --snapshot --single-target --output .
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload binary artifact
-        uses: actions/upload-artifact@v5
-        with:
-          name: binary
-          path: ./concierge
-
-  define-matrix:
-    name: Define spread matrix
-    runs-on: ubuntu-24.04
-    outputs:
-      suites: ${{ steps.suites.outputs.suites }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Go
-        uses: actions/setup-go@v6
-
-      - name: Install
-        run: |
-          go install github.com/snapcore/spread/cmd/spread@latest
-
-      - name: Generate matrix list
-        id: suites
-        run: |
-          list="$(spread -list github-ci | sed "s|github-ci:ubuntu-24.04:tests/||g" | jq -r -ncR '[inputs | select(length>0)]')"
-          echo "suites=$list"
-          echo "suites=$list" >> $GITHUB_OUTPUT
-
-  spread-test:
-    name: Spread (${{ matrix.suite }})
-    runs-on: ubuntu-24.04
-    needs:
-      - binaries
-      - define-matrix
+  tests:
     strategy:
       fail-fast: false
       matrix:
-        suite: ${{ fromJSON(needs.define-matrix.outputs.suites) }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Download binary artifact
-        uses: actions/download-artifact@v6
-        with:
-          name: binary
-
-      - name: Setup Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: "go.mod"
-
-      - name: Install
-        run: |
-          go install github.com/snapcore/spread/cmd/spread@latest
-
-      - name: Run integration tests
-        run: |
-          sudo apt-get remove -y docker-ce docker-ce-cli containerd.io
-          sudo rm -rf /run/containerd
-          spread -v "github-ci:ubuntu-24.04:tests/${{ matrix.suite }}"
+        include:
+          - runner: ubuntu-24.04
+            arch: amd64
+          - runner: self-hosted-linux-ppc64el-noble-edge
+            arch: ppc64le  # note: ppc64le for arch, ppc64el in runner name
+          - runner: self-hosted-linux-s390x-noble-edge
+            arch: s390x
+    uses: ./.github/workflows/tests.yaml
+    with:
+      runner: ${{ matrix.runner }}
+      arch: ${{ matrix.arch }}

.github/workflows/tests.yaml

@@ -0,0 +1,115 @@
+name: Tests
+
+on:
+  workflow_call:
+    inputs:
+      runner:
+        required: true
+        type: string
+      arch:
+        required: true
+        type: string
+
+jobs:
+  binaries:
+    name: Build concierge
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Setup Go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: "go.mod"
+
+      - name: Run tests
+        run: |
+          go test -v -race ./...
+
+      - name: Setup goreleaser
+        run: |
+          sudo snap install --classic goreleaser
+
+      - name: Build concierge
+        id: build
+        run: |
+          goreleaser build --clean --snapshot --single-target --output .
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GOOS: linux
+          GOARCH: ${{ inputs.arch }}
+
+      - name: Upload binary artifact
+        uses: actions/upload-artifact@v5
+        with:
+          name: binary-${{ inputs.runner }}
+          path: ./concierge
+
+  define-matrix:
+    name: Define spread matrix
+    runs-on: ${{ inputs.runner }}
+    outputs:
+      suites: ${{ steps.suites.outputs.suites }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Setup Go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: "go.mod"
+          architecture: ${{ inputs.arch }}
+
+      - name: Install
+        run: |
+          go install github.com/snapcore/spread/cmd/spread@latest
+
+      - name: Generate matrix list
+        id: suites
+        run: |
+          list="$(spread -list github-ci | sed "s|github-ci:ubuntu-24.04:tests/||g" | jq -r -ncR '[inputs | select(length>0)]')"
+          echo "suites=$list"
+          echo "suites=$list" >> $GITHUB_OUTPUT
+
+  spread-test:
+    name: Spread (${{ matrix.suite }})
+    runs-on: ${{ inputs.runner }}
+    needs:
+      - binaries
+      - define-matrix
+    strategy:
+      fail-fast: false
+      matrix:
+        suite: ${{ fromJSON(needs.define-matrix.outputs.suites) }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Download binary artifact
+        uses: actions/download-artifact@v6
+        with:
+          name: binary-${{ inputs.runner }}
+
+      - name: Setup Go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: "go.mod"
+          architecture: ${{ inputs.arch }}
+
+      - name: Install
+        run: |
+          go install github.com/snapcore/spread/cmd/spread@latest
+
+      - name: Uninstall docker and containerd
+        if: ${{ runner.environment == 'github-hosted' }}
+        run: |
+          sudo apt-get remove -y docker-ce docker-ce-cli containerd.io
+          sudo rm -rf /run/containerd
+
+      - name: Run integration tests
+        run: |
+          spread -v "github-ci:ubuntu-24.04:tests/${{ matrix.suite }}"
+

spread.yaml

@@ -83,7 +83,7 @@ path: /root/proj
 prepare: |
   snap refresh --hold
   if systemctl is-enabled unattended-upgrades.service; then
-    systemctl stop unattended-upgrades.service
+    systemctl stop unattended-upgrades.service || echo 'Self-hosted runner?'
     systemctl mask unattended-upgrades.service
   fi