Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump alpine to 3.21 #3200

Merged
merged 4 commits into from
Mar 6, 2025
Merged

Bump alpine to 3.21 #3200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4781ebb
Bump alpine to 3.21
Itxaka Feb 17, 2025
d21377a
Merge branch 'master' into bump_alpine
Itxaka Mar 4, 2025
e943ea5
Bump all and release match
Itxaka Mar 5, 2025
d0e777b
Fix
Itxaka Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
422 changes: 0 additions & 422 deletions .github/flavors.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/image-master-arm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/image-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -94,7 +95,7 @@ jobs:
secureboot: [false]
base_image:
- "ubuntu:24.04"
- "alpine:3.19"
- "alpine:3.21"
test:
- "custom-partitioning"
- "acceptance"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/image-pr-arm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ jobs:
arch: ["arm64"]
base_image:
- "ubuntu:24.04"
- "alpine:3.19"
- "alpine:3.21"
15 changes: 11 additions & 4 deletions .github/workflows/image-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
variant: ["core"] # So it shows up in the name, in case we use it for standard
base_image:
- "ubuntu:24.04"
- "alpine:3.19"
- "alpine:3.21"
lifecycle-tests:
name: ${{ matrix.base_image }}
secrets: inherit
Expand All @@ -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"
Expand All @@ -59,7 +60,7 @@ jobs:
secureboot: [false]
base_image:
- "ubuntu:24.04"
- "alpine:3.19"
- "alpine:3.21"
test:
- "custom-partitioning"
- "acceptance"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -91,7 +98,7 @@ jobs:
matrix:
base_image:
- "ubuntu:24.04"
- "alpine:3.19"
- "alpine:3.21"
encryption-tests:
name: ${{ matrix.base_image }}
secrets: inherit
Expand All @@ -109,7 +116,7 @@ jobs:
matrix:
base_image:
- "ubuntu:24.04"
- "alpine:3.19"
- "alpine:3.21"
label:
- "encryption-local"
- "encryption-remote-auto"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-arm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 }}
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/reusable-qemu-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Loading