Skip to content

Commit cd45871

Browse files
CopilotItxaka
Copilot
and
Itxaka
authored
Bump workflow hadron and hadron-trusted image references to v0.4.0 (#4162)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Itxaka <itxaka@kairos.io> Signed-off-by: Itxaka <itxaka@kairos.io>
1 parent a05185c commit cd45871

8 files changed

Lines changed: 25 additions & 25 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ jobs:
4747
include:
4848
- image_name: "hadron"
4949
model: "generic"
50-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
50+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
5151
cleanup: false
5252
grype: true
5353
custom_job_name_format: "core-arm64-generic"
5454
- image_name: "hadron"
5555
model: "rpi4"
56-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
56+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
5757
cleanup: false
5858
grype: true
5959
custom_job_name_format: "core-arm64-rpi4"
6060
- image_name: "hadron"
6161
model: "rpi3"
62-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
62+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
6363
cleanup: false
6464
grype: true
6565
custom_job_name_format: "core-arm64-rpi3"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ jobs:
4444
matrix:
4545
include:
4646
- image_name: "hadron"
47-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
47+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
4848
kubernetes_distro: ""
4949
custom_job_name_format: "core-amd64-generic"
5050
# Report-only: the scan still runs and reports, but criticals from
5151
# the upstream base image must not block master builds / tests.
5252
security_scan_mode: "report-only"
5353
- image_name: "hadron"
54-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
54+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
5555
kubernetes_distro: "k3s"
5656
custom_job_name_format: "standard-amd64-generic-k3s"
5757
# Report-only: k3s CVEs come from upstream and should not block

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ jobs:
2424
include:
2525
- image_name: "hadron"
2626
model: "rpi4"
27-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
27+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
2828
cleanup: false
2929
grype: true
3030
custom_job_name_format: "core-arm64-rpi4"
3131
- image_name: "hadron"
3232
model: "rpi3"
33-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
33+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
3434
cleanup: false
3535
grype: true
3636
custom_job_name_format: "core-arm64-rpi3"
3737
- image_name: "hadron"
3838
model: "generic"
39-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
39+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
4040
cleanup: false
4141
grype: true
4242
custom_job_name_format: "core-arm64-generic"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
matrix:
2424
include:
2525
- image_name: "hadron"
26-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
26+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
2727
kubernetes_distro: ""
2828
custom_job_name_format: "core-amd64-generic"
2929
- image_name: "hadron"
30-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
30+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
3131
kubernetes_distro: "k3s"
3232
custom_job_name_format: "standard-amd64-generic-k3s"
3333
with:
@@ -56,7 +56,7 @@ jobs:
5656
secrets: inherit
5757
uses: ./.github/workflows/reusable-qemu-test.yaml
5858
with:
59-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
59+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
6060
test: ${{ matrix.test }}
6161
secureboot: false
6262
release-matcher: ${{ matrix.release-matcher || '' }}
@@ -98,7 +98,7 @@ jobs:
9898
repository-projects: read
9999
statuses: read
100100
with:
101-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
101+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
102102
test: ${{ matrix.test }}
103103
variant: "standard"
104104
arch: "amd64"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
base_image:
24-
- "ghcr.io/kairos-io/hadron:v0.3.0"
24+
- "ghcr.io/kairos-io/hadron:v0.4.0"
2525
model:
2626
- "generic"
2727
- "rpi4"
@@ -32,13 +32,13 @@ jobs:
3232
grype: [true]
3333
include:
3434
- image_name: "hadron"
35-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
35+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
3636
model: "generic"
3737
cleanup: true
3838
grype: true
3939
custom_job_name_format: "core-arm64-generic"
4040
- image_name: "hadron"
41-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
41+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
4242
model: "rpi4"
4343
cleanup: true
4444
grype: true
@@ -125,7 +125,7 @@ jobs:
125125
matrix:
126126
kubernetes_version: ${{ fromJson(needs.get-k3s-versions.outputs.kubernetes_versions) }}
127127
base_image:
128-
- "ghcr.io/kairos-io/hadron:v0.3.0"
128+
- "ghcr.io/kairos-io/hadron:v0.4.0"
129129
model:
130130
- "generic"
131131
- "rpi4"

‎.github/workflows/release.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
matrix:
2020
include:
2121
- image_name: "hadron"
22-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
22+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
2323
trusted_boot: false
2424
custom_job_name_format: "core-amd64-generic"
2525
- image_name: "hadron"
26-
base_image: "ghcr.io/kairos-io/hadron:v0.3.0"
26+
base_image: "ghcr.io/kairos-io/hadron:v0.4.0"
2727
trusted_boot: true
2828
custom_job_name_format: "core-amd64-generic-uki"
2929
secrets:
@@ -127,7 +127,7 @@ jobs:
127127
image_name:
128128
- "hadron"
129129
base_image:
130-
- "ghcr.io/kairos-io/hadron:v0.3.0"
130+
- "ghcr.io/kairos-io/hadron:v0.4.0"
131131
kubernetes_version: ${{ fromJson(needs.get-k3s-versions.outputs.kubernetes_versions) }}
132132
secrets:
133133
registry_username: ${{ secrets.QUAY_USERNAME }}
@@ -173,7 +173,7 @@ jobs:
173173
image_name:
174174
- "hadron"
175175
base_image:
176-
- "ghcr.io/kairos-io/hadron:v0.3.0"
176+
- "ghcr.io/kairos-io/hadron:v0.4.0"
177177
kubernetes_version: ${{ fromJson(needs.get-k0s-versions.outputs.kubernetes_versions) }}
178178
secrets:
179179
registry_username: ${{ secrets.QUAY_USERNAME }}

‎.github/workflows/uki.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ jobs:
4747
matrix:
4848
include:
4949
- image_name: "hadron-trusted"
50-
base_image: "ghcr.io/kairos-io/hadron-trusted:v0.0.4"
50+
base_image: "ghcr.io/kairos-io/hadron-trusted:v0.4.0"
5151
kubernetes_distro: ""
5252
custom_job_name_format: "core-amd64-generic-uki"
5353
- image_name: "hadron-trusted"
54-
base_image: "ghcr.io/kairos-io/hadron-trusted:v0.0.4"
54+
base_image: "ghcr.io/kairos-io/hadron-trusted:v0.4.0"
5555
kubernetes_distro: "k3s"
5656
custom_job_name_format: "standard-amd64-generic-k3s-uki"
5757
test_generic:
@@ -63,7 +63,7 @@ jobs:
6363
matrix:
6464
image_label: ["hadron-trusted"]
6565
base_image:
66-
- "ghcr.io/kairos-io/hadron-trusted:v0.0.4"
66+
- "ghcr.io/kairos-io/hadron-trusted:v0.4.0"
6767
arch: ["amd64"]
6868
model: ["generic"]
6969
variant: ["standard"]
@@ -216,7 +216,7 @@ jobs:
216216
matrix:
217217
image_label: ["hadron-trusted"]
218218
base_image:
219-
- "ghcr.io/kairos-io/hadron-trusted:v0.0.4"
219+
- "ghcr.io/kairos-io/hadron-trusted:v0.4.0"
220220
arch: ["amd64"]
221221
model: ["generic"]
222222
variant: ["core"]

‎tests/uki_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func genericTests(vm VM) {
198198
out, err := vm.Sudo("journalctl -t kairos-agent")
199199
Expect(err).ToNot(HaveOccurred(), out)
200200
return out
201-
}, 2*time.Minute).Should(And(
201+
}, 5*time.Minute, 30*time.Second).Should(And(
202202
ContainSubstring("Running after-install hook"),
203203
ContainSubstring("Encrypting partitions"),
204204
ContainSubstring("Successfully encrypted partition"),

0 commit comments

Comments
 (0)