Add variant build to test matrix

Signed-off-by: Itxaka <[email protected]>
kairos-io · Feb 3, 2025 · 9a8221f · 9a8221f
1 parent 8786063
commit 9a8221f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,12 +12,23 @@ concurrency:
 
 jobs:
   testing_build_matrix:
-    name: ${{ matrix.platform }} - ${{ matrix.base_image }}
+    name: ${{ matrix.platform }} - ${{ matrix.base_image }} - ${{ matrix.variant }} - ${{ matrix.kubernetes_provider }}
     runs-on: ${{ matrix.platform == 'linux/arm64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
     strategy:
       matrix:
+        variant: [ "core" ]
+        kubernetes_provider: [ "k3s"]
         platform: [ "linux/amd64", "linux/arm64" ]
         base_image: [ "ubuntu:20.04", "ubuntu:24.04", "debian:12", "alpine:3.19", "alpine:3.21", "opensuse/leap:15.6", "opensuse/tumbleweed", "rockylinux:9" ]
+        include:
+          - platform: "linux/amd64"
+            base_image: "ubuntu:22.04"
+            variant: "standard"
+            kubernetes_provider: "k3s"
+          - platform: "linux/amd64"
+            base_image: "ubuntu:22.04"
+            variant: "standard"
+            kubernetes_provider: "k0s"
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
@@ -35,4 +46,6 @@ jobs:
           push: false
           tags: kairos-${{ matrix.base_image }}
           build-args: |
-            BASE_IMAGE=${{ matrix.base_image }}
+            BASE_IMAGE=${{ matrix.base_image }}
+            VARIANT=${{ matrix.variant }}
+            KUBERNETES_PROVIDER=${{ matrix.kubernetes_provider }}
diff --git a/Dockerfile.test b/Dockerfile.test
@@ -23,10 +23,10 @@ FROM ${BASE_IMAGE}
 ARG VARIANT=core
 ARG MODEL=generic
 ARG TRUSTED_BOOT=false
-ARG K3S_PROVIDER=k3s
+ARG KUBERNETES_PROVIDER=k3s
 
 COPY --from=kairos-init /kairos-init /kairos-init
-RUN /kairos-init -l debug -s install -m "${MODEL}" -v "${VARIANT}" -t "${TRUSTED_BOOT}" -k "${K3S_PROVIDER}"
-RUN /kairos-init -l debug -s init -m "${MODEL}" -v "${VARIANT}" -t "${TRUSTED_BOOT}" -k "${K3S_PROVIDER}"
-RUN /kairos-init -l debug --validate -m "${MODEL}" -v "${VARIANT}" -t "${TRUSTED_BOOT}" -k "${K3S_PROVIDER}"
+RUN /kairos-init -l debug -s install -m "${MODEL}" -v "${VARIANT}" -t "${TRUSTED_BOOT}" -k "${KUBERNETES_PROVIDER}"
+RUN /kairos-init -l debug -s init -m "${MODEL}" -v "${VARIANT}" -t "${TRUSTED_BOOT}" -k "${KUBERNETES_PROVIDER}"
+RUN /kairos-init -l debug --validate -m "${MODEL}" -v "${VARIANT}" -t "${TRUSTED_BOOT}" -k "${KUBERNETES_PROVIDER}"
 RUN rm /kairos-init