Skip to content

Commit c4602fa

Browse files
mauromoralesItxaka
mauromorales
and
Itxaka
authored
Introduce Ubuntu 25.10 (#3610)
* replace 24.10 for 25.04 and add in other cases Signed-off-by: Mauro Morales <[email protected]> * uki Signed-off-by: Mauro Morales <[email protected]> * bump to 25.10 Signed-off-by: Mauro Morales <[email protected]> * bump latest artifact version Signed-off-by: Mauro Morales <[email protected]> * 3.5.2 was released Signed-off-by: Mauro Morales <[email protected]> * latest init Signed-off-by: Mauro Morales <[email protected]> * remove comment Signed-off-by: Mauro Morales <[email protected]> * error pushing the logs Signed-off-by: Mauro Morales <[email protected]> * test with cryptsetup-2.8 Signed-off-by: Mauro Morales <[email protected]> * kairos-init main Signed-off-by: Mauro Morales <[email protected]> * temp ubuntu & fedora Signed-off-by: Mauro Morales <[email protected]> * add alpine Signed-off-by: Mauro Morales <[email protected]> * arch Signed-off-by: Mauro Morales <[email protected]> * declare targetarch Signed-off-by: Mauro Morales <[email protected]> * default targetarch Signed-off-by: Mauro Morales <[email protected]> * cursor is useless Signed-off-by: Mauro Morales <[email protected]> * cursor is soooo uselessssss Signed-off-by: Mauro Morales <[email protected]> * use stages to reduce image size Signed-off-by: Mauro Morales <[email protected]> * the never ending story Signed-off-by: Mauro Morales <[email protected]> * why cursor, why? Signed-off-by: Mauro Morales <[email protected]> * here we go again Signed-off-by: Mauro Morales <[email protected]> * use rc Signed-off-by: Mauro Morales <[email protected]> * madness Signed-off-by: Mauro Morales <[email protected]> * k3s not k8s Signed-off-by: Mauro Morales <[email protected]> * string issue Signed-off-by: Mauro Morales <[email protected]> * temp only ubuntu 25.10 Signed-off-by: Mauro Morales <[email protected]> * indentation Signed-off-by: Mauro Morales <[email protected]> * bump memory and drive size Signed-off-by: Mauro Morales <[email protected]> * output install error Signed-off-by: Mauro Morales <[email protected]> * Update reusable-encryption-test.yaml Signed-off-by: Itxaka <[email protected]> * bring back missing tests Signed-off-by: Mauro Morales <[email protected]> --------- Signed-off-by: Mauro Morales <[email protected]> Signed-off-by: Itxaka <[email protected]> Co-authored-by: Itxaka <[email protected]>
1 parent b0099d7 commit c4602fa

File tree

8 files changed

+55
-17
lines changed

8 files changed

+55
-17
lines changed

‎.github/workflows/image-master.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
base_image:
42+
- "ubuntu:25.10"
4243
- "ubuntu:24.04"
4344
- "ubuntu:22.04"
4445
- "ubuntu:20.04"
@@ -71,6 +72,7 @@ jobs:
7172
fail-fast: false
7273
matrix:
7374
base_image:
75+
- "ubuntu:25.10"
7476
- "ubuntu:24.04"
7577
- "ubuntu:22.04"
7678
- "ubuntu:20.04"

‎.github/workflows/image-pr.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
base_image:
40+
- "ubuntu:25.10"
4041
- "ubuntu:24.04"
4142
- "alpine:3.21"
4243

@@ -59,6 +60,7 @@ jobs:
5960
matrix:
6061
secureboot: [false]
6162
base_image:
63+
- "ubuntu:25.10"
6264
- "ubuntu:24.04"
6365
- "alpine:3.21"
6466
test:
@@ -70,13 +72,23 @@ jobs:
7072
- "upgrade-with-cli"
7173
- "upgrade-latest-with-cli"
7274
include:
75+
- test: "install"
76+
secureboot: true
77+
base_image: "ubuntu:25.10"
78+
- test: "zfs"
79+
base_image: "ubuntu:25.10"
80+
- test: "bundles"
81+
base_image: "ubuntu:25.10"
7382
- test: "install"
7483
secureboot: true
7584
base_image: "ubuntu:24.04"
7685
- test: "zfs"
7786
base_image: "ubuntu:24.04"
7887
- test: "bundles"
7988
base_image: "ubuntu:24.04"
89+
- test: "upgrade-latest-with-cli"
90+
base_image: "ubuntu:25.10"
91+
release-matcher: "kairos-ubuntu-24.04-core-amd64-generic-v3.5.3.iso"
8092
netboot-tests:
8193
name: ${{ matrix.base_image }}
8294
uses: ./.github/workflows/reusable-qemu-netboot-test.yaml
@@ -91,6 +103,7 @@ jobs:
91103
strategy:
92104
matrix:
93105
base_image:
106+
- "ubuntu:25.10"
94107
- "ubuntu:24.04"
95108
- "alpine:3.21"
96109
encryption-tests:
@@ -109,6 +122,7 @@ jobs:
109122
fail-fast: true
110123
matrix:
111124
base_image:
125+
- "ubuntu:25.10"
112126
- "ubuntu:24.04"
113127
- "alpine:3.21"
114128
label:

‎.github/workflows/release-arm.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- "ubuntu:20.04"
2626
- "ubuntu:22.04"
2727
- "ubuntu:24.04"
28-
- "ubuntu:24.10"
28+
- "ubuntu:25.10"
2929
- "alpine:3.21"
3030
- "fedora:40"
3131
- "debian:12"
@@ -122,7 +122,7 @@ jobs:
122122
- "ubuntu:20.04"
123123
- "ubuntu:22.04"
124124
- "ubuntu:24.04"
125-
- "ubuntu:24.10"
125+
- "ubuntu:25.10"
126126
- "alpine:3.21"
127127
- "fedora:40"
128128
- "debian:12"

‎.github/workflows/release.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- "ubuntu:20.04"
2323
- "ubuntu:22.04"
2424
- "ubuntu:24.04"
25-
- "ubuntu:24.10"
25+
- "ubuntu:25.10"
2626
- "alpine:3.21"
2727
- "fedora:40"
2828
- "debian:12"
@@ -151,7 +151,7 @@ jobs:
151151
- "ubuntu:20.04"
152152
- "ubuntu:22.04"
153153
- "ubuntu:24.04"
154-
- "ubuntu:24.10"
154+
- "ubuntu:25.10"
155155
- "alpine:3.21"
156156
- "fedora:40"
157157
- "debian:12"
@@ -191,7 +191,7 @@ jobs:
191191
kubernetes_version: ${{ fromJson(needs.get-k0s-versions.outputs.kubernetes_versions) }}
192192
base_image:
193193
- "opensuse/leap:15.6"
194-
- "ubuntu:24.10"
194+
- "ubuntu:25.10"
195195
- "rockylinux:9"
196196
secrets:
197197
registry_username: ${{ secrets.QUAY_USERNAME }}

‎.github/workflows/reusable-encryption-test.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
jobs:
2323
test:
2424
name: ${{ inputs.label }}
25-
runs-on: ubuntu-latest
25+
runs-on: fast
2626
defaults:
2727
run:
2828
shell: bash -eo pipefail {0}
@@ -89,8 +89,15 @@ jobs:
8989
EMULATE_TPM: true
9090
CREATE_VM: true
9191
USE_QEMU: true
92-
MEMORY: 4000
92+
MEMORY: 6000
9393
CPUS: 2
94+
DRIVE_SIZE: 50000
9495
run: |
9596
export ISO=$(ls $PWD/*${{ steps.split.outputs.flavor }}*.iso)
9697
.github/encryption-tests.sh
98+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
99+
if: failure()
100+
with:
101+
name: ${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ inputs.variant }}-${{ inputs.label }}.logs.zip
102+
path: tests/**/logs/*
103+
if-no-files-found: warn

‎.github/workflows/uki.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ jobs:
4141
summary_artifacts: true
4242
strategy:
4343
matrix:
44-
base_image: ["ubuntu:24.04", "fedora:40"]
44+
base_image: ["ubuntu:25.10", "ubuntu:24.04", "fedora:40"]
4545
kubernetes_distro: ["", "k3s"]
4646
test_generic:
4747
needs: factory
4848
runs-on: kvm
4949
strategy:
5050
matrix:
51-
base_image: ["ubuntu:24.04", "fedora:40"]
51+
base_image: ["ubuntu:25.10", "ubuntu:24.04", "fedora:40"]
5252
arch: ["amd64"]
5353
model: ["generic"]
5454
variant: ["core", "standard"]
@@ -159,7 +159,7 @@ jobs:
159159
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
160160
if: failure()
161161
with:
162-
name: ${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ inputs.variant }}-generic-uki.logs.zip
162+
name: ${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ matrix.variant }}-generic-uki.logs.zip
163163
path: tests/**/logs/*
164164
if-no-files-found: warn
165165
test_boot_assessment:

‎images/Dockerfile‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BASE_IMAGE=ubuntu:20.04
2-
ARG KAIROS_INIT=v0.5.20
2+
ARG KAIROS_INIT=v0.6.0-RC1
33

44
FROM quay.io/kairos/kairos-init:${KAIROS_INIT} AS kairos-init
55

@@ -11,4 +11,18 @@ ARG KUBERNETES_VERSION
1111
ARG VERSION
1212

1313
RUN --mount=type=bind,from=kairos-init,src=/kairos-init,dst=/kairos-init \
14-
/kairos-init -l debug -m "${MODEL}" -t "${TRUSTED_BOOT}" -k "${KUBERNETES_DISTRO}" --k8sversion "${KUBERNETES_VERSION}" --version "${VERSION}" && /kairos-init validate -t "${TRUSTED_BOOT}"
14+
if [ -n "${KUBERNETES_DISTRO}" ]; then \
15+
K8S_FLAG="-p ${KUBERNETES_DISTRO}"; \
16+
if [ "${KUBERNETES_DISTRO}" = "k0s" ] && [ -n "${KUBERNETES_VERSION}" ]; then \
17+
K8S_VERSION_FLAG="--provider-k0s-version \"${KUBERNETES_VERSION}\""; \
18+
elif [ "${KUBERNETES_DISTRO}" = "k3s" ] && [ -n "${KUBERNETES_VERSION}" ]; then \
19+
K8S_VERSION_FLAG="--provider-k3s-version \"${KUBERNETES_VERSION}\""; \
20+
else \
21+
K8S_VERSION_FLAG=""; \
22+
fi; \
23+
else \
24+
K8S_FLAG=""; \
25+
K8S_VERSION_FLAG=""; \
26+
fi; \
27+
eval /kairos-init -l debug -s install -m \"${MODEL}\" -t \"${TRUSTED_BOOT}\" ${K8S_FLAG} ${K8S_VERSION_FLAG} --version \"${VERSION}\" && \
28+
eval /kairos-init -l debug -s init -m \"${MODEL}\" -t \"${TRUSTED_BOOT}\" ${K8S_FLAG} ${K8S_VERSION_FLAG} --version \"${VERSION}\"

‎tests/encryption_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ kcrypt:
188188
var err error
189189

190190
BeforeEach(func() {
191+
Expect(installError).ToNot(HaveOccurred(), installationOutput)
191192
tpmHash, err = vm.Sudo("/system/discovery/kcrypt-discovery-challenger")
192193
Expect(err).ToNot(HaveOccurred(), tpmHash)
193194

@@ -206,15 +207,15 @@ stringData:
206207
apiVersion: keyserver.kairos.io/v1alpha1
207208
kind: SealedVolume
208209
metadata:
209-
name: %[1]s
210-
namespace: default
210+
name: "%[1]s"
211+
namespace: default
211212
spec:
212213
TPMHash: "%[1]s"
213214
partitions:
214215
- label: COS_PERSISTENT
215216
secret:
216-
name: %[1]s
217-
path: pass
217+
name: "%[1]s"
218+
path: pass
218219
quarantined: false
219220
`, tpmHash))
220221

@@ -390,7 +391,7 @@ func kubectlApplyYaml(yamlData string) {
390391

391392
cmd := exec.Command("kubectl", "apply", "-f", yamlFile.Name())
392393
out, err := cmd.CombinedOutput()
393-
Expect(err).ToNot(HaveOccurred(), out)
394+
Expect(err).ToNot(HaveOccurred(), string(out))
394395
}
395396

396397
func getChallengerServerCert() string {

0 commit comments

Comments
 (0)