Bump all and release match

Signed-off-by: Itxaka <[email protected]>
kairos-io · Mar 5, 2025 · e943ea5 · e943ea5
1 parent d21377a
commit e943ea5
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 435 deletions.
diff --git a/.github/flavors.json b/.github/flavors.json
diff --git a/.github/workflows/image-master-arm.yaml b/.github/workflows/image-master-arm.yaml
@@ -42,7 +42,7 @@ jobs:
         model: ["generic", "rpi4", "rpi3"]
         base_image:
           - "ubuntu:24.04"
-          - "alpine:3.19"
+          - "alpine:3.21"
   build-nvidia-base:
     runs-on: fast
     steps:

diff --git a/.github/workflows/image-master.yaml b/.github/workflows/image-master.yaml
@@ -44,7 +44,7 @@ jobs:
           - "ubuntu:24.04"
           - "ubuntu:22.04"
           - "ubuntu:20.04"
-          - "alpine:3.19"
+          - "alpine:3.21"
           - "opensuse/leap:15.6"
           - "debian:12"
         include:
@@ -57,7 +57,7 @@ jobs:
           - base_image: "ubuntu:20.04"
             kubernetes_distro: "k3s"
             variant: "standard"
-          - base_image: "alpine:3.19"
+          - base_image: "alpine:3.21"
             kubernetes_distro: "k3s"
             variant: "standard"
           - base_image: "opensuse/leap:15.6"
@@ -83,6 +83,7 @@ jobs:
       base_image: ${{ matrix.base_image }}
       test: ${{ matrix.test }}
       secureboot: ${{ matrix.secureboot || false}}
+      release-matcher: ${{ matrix.release-matcher || '' }}
       variant: "core"
       arch: "amd64"
       model: "generic"
@@ -94,7 +95,7 @@ jobs:
         secureboot: [false]
         base_image:
           - "ubuntu:24.04"
-          - "alpine:3.19"
+          - "alpine:3.21"
         test:
           - "custom-partitioning"
           - "acceptance"
@@ -103,6 +104,9 @@ jobs:
           - "reset"
           - "upgrade-with-cli"
           - "upgrade-latest"
+        exclude:
+          - test: "upgrade-latest"
+            base_image: "alpine:3.21"
         include:
           - test: "install"
             secureboot: true
@@ -128,6 +132,9 @@ jobs:
             base_image: "opensuse/leap:15.6"
           - test: "acceptance"
             base_image: "debian:12"
+          - test: "upgrade-latest"
+            base_image: "alpine:3.21"
+            release-matcher: "kairos-alpine-3.19-core-amd64-generic-v3.3.1.iso"
   netboot-tests:
     name: ${{ matrix.base_image }}
     uses: ./.github/workflows/reusable-qemu-netboot-test.yaml
@@ -143,7 +150,7 @@ jobs:
       matrix:
         base_image:
           - "ubuntu:24.04"
-          - "alpine:3.19"
+          - "alpine:3.21"
   encryption-tests:
     name: ${{ matrix.base_image }}
     uses: ./.github/workflows/reusable-encryption-test.yaml

diff --git a/.github/workflows/image-pr-arm.yaml b/.github/workflows/image-pr-arm.yaml
@@ -41,4 +41,4 @@ jobs:
         arch: ["arm64"]
         base_image:
           - "ubuntu:24.04"
-          - "alpine:3.19"
+          - "alpine:3.21"
diff --git a/.github/workflows/image-pr.yaml b/.github/workflows/image-pr.yaml
@@ -48,6 +48,7 @@ jobs:
       base_image: ${{ matrix.base_image }}
       test: ${{ matrix.test }}
       secureboot: ${{ matrix.secureboot || false}}
+      release-matcher: ${{ matrix.release-matcher || '' }}
       variant: "core"
       arch: "amd64"
       model: "generic"
@@ -68,6 +69,9 @@ jobs:
           - "reset"
           - "upgrade-with-cli"
           - "upgrade-latest"
+        exclude:
+          - test: "upgrade-latest"
+            base_image: "alpine:3.21"
         include:
           - test: "install"
             secureboot: true
@@ -76,6 +80,9 @@ jobs:
             base_image: "ubuntu:24.04"
           - test: "bundles"
             base_image: "ubuntu:24.04"
+          - test: "upgrade-latest"
+            base_image: "alpine:3.21"
+            release-matcher: "kairos-alpine-3.19-core-amd64-generic-v3.3.1.iso"
   netboot-tests:
     name: ${{ matrix.base_image }}
     uses: ./.github/workflows/reusable-qemu-netboot-test.yaml

diff --git a/.github/workflows/release-arm.yaml b/.github/workflows/release-arm.yaml
@@ -27,7 +27,7 @@ jobs:
           - "ubuntu:22.04"
           - "ubuntu:24.04"
           - "ubuntu:24.10"
-          - "alpine:3.19"
+          - "alpine:3.21"
           - "fedora:40"
           - "debian:12"
           - "rockylinux:9"
@@ -54,7 +54,7 @@ jobs:
           - "opensuse/leap:15.6"
           - "ubuntu:20.04"
           - "ubuntu:22.04"
-          - "alpine:3.19"
+          - "alpine:3.21"
     with:
       base_image: ${{ matrix.base_image }}
       arch: ${{ matrix.arch }}
@@ -106,7 +106,7 @@ jobs:
           - "ubuntu:22.04"
           - "ubuntu:24.04"
           - "ubuntu:24.10"
-          - "alpine:3.19"
+          - "alpine:3.21"
           - "fedora:40"
           - "debian:12"
           - "rockylinux:9"
@@ -137,7 +137,7 @@ jobs:
           - "opensuse/leap:15.6"
           - "ubuntu:20.04"
           - "ubuntu:22.04"
-          - "alpine:3.19"
+          - "alpine:3.21"
     with:
       base_image: ${{ matrix.base_image }}
       arch: ${{ matrix.arch }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -37,7 +37,7 @@ jobs:
           - "ubuntu:22.04"
           - "ubuntu:24.04"
           - "ubuntu:24.10"
-          - "alpine:3.19"
+          - "alpine:3.21"
           - "fedora:40"
           - "debian:12"
           - "rockylinux:9"
@@ -161,7 +161,7 @@ jobs:
           - "ubuntu:22.04"
           - "ubuntu:24.04"
           - "ubuntu:24.10"
-          - "alpine:3.19"
+          - "alpine:3.21"
           - "fedora:40"
           - "debian:12"
           - "rockylinux:9"

diff --git a/.github/workflows/reusable-qemu-test.yaml b/.github/workflows/reusable-qemu-test.yaml
@@ -26,6 +26,11 @@ on:
       kubernetes_distro:
         required: false
         type: string
+      release-matcher:
+        description: "The release matcher to use for the latest release. Full regex match"
+        required: false
+        type: string
+        default: ""
 
 permissions: read-all
 jobs:
@@ -101,11 +106,18 @@ jobs:
           name: kairos-${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ inputs.variant }}-${{ inputs.arch }}-${{ inputs.model }}${{ inputs.kubernetes_distro != '' && format('-{0}', inputs.kubernetes_distro) || '' }}.iso.zip
       - name: Download latest release
         uses: robinraju/[email protected]
-        if: ${{ inputs.test == 'upgrade-latest' || inputs.test == 'provider-upgrade-latest-k8s-with-kubernetes' }}
+        if: ${{ inputs.test == 'upgrade-latest' || inputs.test == 'provider-upgrade-latest-k8s-with-kubernetes' && inputs.release-matcher == '' }}
         with:
           latest: true
           fileName: 'kairos-${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ inputs.variant }}-${{ inputs.arch }}-${{ inputs.model }}-*.iso'
           out-file-path: ""
+      - name: Download latest release with release matcher
+        uses: robinraju/[email protected]
+        if: ${{ inputs.test == 'upgrade-latest' || inputs.test == 'provider-upgrade-latest-k8s-with-kubernetes' && inputs.release-matcher != '' }}
+        with:
+          latest: true
+          fileName: ${{ inputs.release-matcher }}
+          out-file-path: ""
       - name: Prepare test bundle
         if: ${{ inputs.test == 'bundles' }}
         uses: docker/build-push-action@v6