Skip to content

Commit b44bfce

Browse files
mauromoralesmauromorales
authored
rename factory action jobs for hadron (#4008)
* rename factory action jobs for hadron Signed-off-by: Mauro Morales <contact@mauromorales.com> * literal names Signed-off-by: Mauro Morales <contact@mauromorales.com> * more jobs Signed-off-by: Mauro Morales <contact@mauromorales.com> * some more Signed-off-by: Mauro Morales <contact@mauromorales.com> * keep unique string Signed-off-by: Mauro Morales <contact@mauromorales.com> * use matrix and includes instead of single line Signed-off-by: Mauro Morales <contact@mauromorales.com> * simplify names Signed-off-by: Mauro Morales <contact@mauromorales.com> * test_generic Signed-off-by: Mauro Morales <contact@mauromorales.com> --------- Signed-off-by: Mauro Morales <contact@mauromorales.com>
1 parent 96bcf3f commit b44bfce

7 files changed

Lines changed: 165 additions & 77 deletions

File tree

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

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616
cancel-in-progress: true
1717
jobs:
1818
build:
19-
name: ${{ matrix.base_image }}
19+
name: ${{ matrix.image_name }}
2020
uses: kairos-io/kairos-factory-action/.github/workflows/reusable-factory.yaml@84ea9b020bdd470081b235a1a99147a98d32c989 # v1.1.1
2121
secrets:
2222
registry_username: ${{ secrets.QUAY_USERNAME }}
@@ -35,23 +35,41 @@ jobs:
3535
registry_repository: "ci-temp-images"
3636
custom_tag_format: "$FLAVOR-$FLAVOR_RELEASE-$VARIANT-$ARCH-$MODEL-$COMMIT_SHA"
3737
custom_artifact_format: "kairos-$FLAVOR-$FLAVOR_RELEASE-$VARIANT-$ARCH-$MODEL"
38+
custom_job_name_format: ${{ matrix.custom_job_name_format }}
3839
image_labels: "quay.expires-after=2w"
3940
summary_artifacts: true
4041
cleanup: ${{ matrix.cleanup }}
4142
strategy:
4243
fail-fast: false
4344
matrix:
44-
model: ["generic", "rpi4", "rpi3"]
45-
base_image:
46-
- "ghcr.io/kairos-io/hadron:v0.0.4"
47-
cleanup: [false]
48-
grype: [true]
4945
include:
46+
- image_name: "hadron"
47+
model: "generic"
48+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
49+
cleanup: false
50+
grype: true
51+
custom_job_name_format: "core-arm64-generic"
52+
- image_name: "hadron"
53+
model: "rpi4"
54+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
55+
cleanup: false
56+
grype: true
57+
custom_job_name_format: "core-arm64-rpi4"
58+
- image_name: "hadron"
59+
model: "rpi3"
60+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
61+
cleanup: false
62+
grype: true
63+
custom_job_name_format: "core-arm64-rpi3"
5064
- model: "nvidia-jetson-agx-orin"
65+
image_name: "ubuntu:22.04"
5166
base_image: "ubuntu:22.04"
5267
cleanup: true
5368
grype: true
69+
custom_job_name_format: ""
5470
- model: "nvidia-jetson-orin-nx"
71+
image_name: "ubuntu:22.04"
5572
base_image: "ubuntu:22.04"
5673
cleanup: true
5774
grype: false # too many vulns under the L4T rootfs
75+
custom_job_name_format: ""

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515
cancel-in-progress: true
1616
jobs:
1717
build:
18-
name: ${{ matrix.base_image }}
18+
name: ${{ matrix.image_name }}
1919
uses: kairos-io/kairos-factory-action/.github/workflows/reusable-factory.yaml@84ea9b020bdd470081b235a1a99147a98d32c989 # v1.1.1
2020
secrets:
2121
registry_username: ${{ secrets.QUAY_USERNAME }}
@@ -35,14 +35,19 @@ jobs:
3535
registry_repository: "ci-temp-images"
3636
custom_tag_format: "$FLAVOR-$FLAVOR_RELEASE-$VARIANT-$ARCH-$MODEL-$COMMIT_SHA"
3737
custom_artifact_format: "kairos-$FLAVOR-$FLAVOR_RELEASE-$VARIANT-$ARCH-$MODEL"
38+
custom_job_name_format: ${{ matrix.custom_job_name_format }}
3839
image_labels: "quay.expires-after=2w"
3940
summary_artifacts: true
4041
kubernetes_distro: ${{ matrix.kubernetes_distro }}
4142
strategy:
4243
fail-fast: false
4344
matrix:
44-
base_image:
45-
- "ghcr.io/kairos-io/hadron:v0.0.4"
46-
kubernetes_distro:
47-
- ""
48-
- "k3s"
45+
include:
46+
- image_name: "hadron"
47+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
48+
kubernetes_distro: ""
49+
custom_job_name_format: "core-amd64-generic"
50+
- image_name: "hadron"
51+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
52+
kubernetes_distro: "k3s"
53+
custom_job_name_format: "standard-amd64-generic-k3s"

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

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,45 @@ concurrency:
1313
cancel-in-progress: true
1414
jobs:
1515
build:
16-
name: ${{ matrix.base_image }}
16+
name: ${{ matrix.image_name }}
1717
uses: kairos-io/kairos-factory-action/.github/workflows/reusable-factory.yaml@84ea9b020bdd470081b235a1a99147a98d32c989 # v1.1.1
1818
secrets:
1919
registry_username: ${{ secrets.QUAY_USERNAME }}
2020
registry_password: ${{ secrets.QUAY_PASSWORD }}
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
model: ["rpi4", "rpi3", "generic"]
25-
cleanup: [false]
26-
grype: [true]
27-
base_image:
28-
- "ghcr.io/kairos-io/hadron:v0.0.4"
2924
include:
30-
- model: "nvidia-jetson-agx-orin"
25+
- image_name: "hadron"
26+
model: "rpi4"
27+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
28+
cleanup: false
29+
grype: true
30+
custom_job_name_format: "core-arm64-rpi4"
31+
- image_name: "hadron"
32+
model: "rpi3"
33+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
34+
cleanup: false
35+
grype: true
36+
custom_job_name_format: "core-arm64-rpi3"
37+
- image_name: "hadron"
38+
model: "generic"
39+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
40+
cleanup: false
41+
grype: true
42+
custom_job_name_format: "core-arm64-generic"
43+
- image_name: "ubuntu:22.04"
44+
model: "nvidia-jetson-agx-orin"
3145
base_image: "ubuntu:22.04"
3246
cleanup: true
3347
grype: false
34-
- model: "nvidia-jetson-orin-nx"
48+
custom_job_name_format: ""
49+
- image_name: "ubuntu:22.04"
50+
model: "nvidia-jetson-orin-nx"
3551
base_image: "ubuntu:22.04"
3652
cleanup: true
3753
grype: false # too many vulns under the L4T rootfs
54+
custom_job_name_format: ""
3855
with:
3956
auroraboot_version: "v0.19.4"
4057
dockerfile_path: "images/Dockerfile"
@@ -50,6 +67,7 @@ jobs:
5067
registry_repository: "ci-temp-images"
5168
custom_tag_format: "$FLAVOR-$FLAVOR_RELEASE-$VARIANT-$ARCH-$MODEL-$COMMIT_SHA"
5269
custom_artifact_format: "kairos-$FLAVOR-$FLAVOR_RELEASE-$VARIANT-$ARCH-$MODEL"
70+
custom_job_name_format: ${{ matrix.custom_job_name_format }}
5371
image_labels: "quay.expires-after=6h"
5472
summary_artifacts: true
5573
cleanup: ${{ matrix.cleanup }}

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

Lines changed: 36 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,23 @@ concurrency:
1313
cancel-in-progress: true
1414
jobs:
1515
build:
16-
name: ${{ matrix.base_image }}
16+
name: ${{ matrix.image_name }}
1717
uses: kairos-io/kairos-factory-action/.github/workflows/reusable-factory.yaml@84ea9b020bdd470081b235a1a99147a98d32c989 # v1.1.1
1818
secrets:
1919
registry_username: ${{ secrets.QUAY_USERNAME }}
2020
registry_password: ${{ secrets.QUAY_PASSWORD }}
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
base_image:
25-
- "ghcr.io/kairos-io/hadron:v0.0.4"
26-
kubernetes_distro:
27-
- ""
28-
- "k3s"
24+
include:
25+
- image_name: "hadron"
26+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
27+
kubernetes_distro: ""
28+
custom_job_name_format: "core-amd64-generic"
29+
- image_name: "hadron"
30+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
31+
kubernetes_distro: "k3s"
32+
custom_job_name_format: "standard-amd64-generic-k3s"
2933
with:
3034
auroraboot_version: "v0.19.4"
3135
dockerfile_path: "images/Dockerfile"
@@ -41,44 +45,39 @@ jobs:
4145
registry_repository: "ci-temp-images"
4246
custom_tag_format: "$FLAVOR-$FLAVOR_RELEASE-$VARIANT-$ARCH-$MODEL-$COMMIT_SHA"
4347
custom_artifact_format: "kairos-$FLAVOR-$FLAVOR_RELEASE-$VARIANT-$ARCH-$MODEL"
48+
custom_job_name_format: ${{ matrix.custom_job_name_format }}
4449
image_labels: "quay.expires-after=6h"
4550
summary_artifacts: true
4651
kubernetes_distro: ${{ matrix.kubernetes_distro }}
4752
core-tests:
48-
name: ${{ matrix.base_image }}
53+
name: ${{ format('core-tests (hadron, amd64, generic) {0}', matrix.test) }}
4954
secrets: inherit
5055
uses: ./.github/workflows/reusable-qemu-test.yaml
5156
with:
52-
base_image: ${{ matrix.base_image }}
57+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
5358
test: ${{ matrix.test }}
54-
secureboot: ${{ matrix.secureboot || false}}
59+
secureboot: false
5560
release-matcher: ${{ matrix.release-matcher || '' }}
56-
variant: ${{ matrix.variant || 'core' }}
61+
variant: "core"
5762
arch: "amd64"
5863
model: "generic"
5964
needs:
6065
- build
6166
strategy:
6267
fail-fast: false
6368
matrix:
64-
secureboot: [false]
65-
variant: ["core"]
66-
base_image:
67-
- "ghcr.io/kairos-io/hadron:v0.0.4"
68-
test:
69-
- "custom-partitioning"
70-
- "acceptance"
71-
- "install"
72-
- "install-target"
73-
- "reset"
74-
- "upgrade-with-cli"
75-
- "bundles"
7669
include:
77-
- base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
70+
- test: "custom-partitioning"
71+
- test: "acceptance"
72+
- test: "install"
73+
- test: "install-target"
74+
- test: "reset"
75+
- test: "upgrade-with-cli"
76+
- test: "bundles"
77+
- test: "upgrade-latest-with-cli"
7878
release-matcher: "kairos-hadron-0.0.1-core-amd64-generic-v4.0.0.iso"
79-
test: "upgrade-latest-with-cli"
8079
standard-tests:
81-
name: ${{ matrix.base_image }}
80+
name: ${{ format('standard-tests (hadron, amd64, generic) {0}', matrix.test) }}
8281
uses: ./.github/workflows/reusable-qemu-test.yaml
8382
secrets: inherit
8483
permissions:
@@ -97,7 +96,7 @@ jobs:
9796
repository-projects: read
9897
statuses: read
9998
with:
100-
base_image: ${{ matrix.base_image }}
99+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
101100
test: ${{ matrix.test }}
102101
variant: "standard"
103102
arch: "amd64"
@@ -110,20 +109,16 @@ jobs:
110109
strategy:
111110
fail-fast: false
112111
matrix:
113-
base_image:
114-
- "ghcr.io/kairos-io/hadron:v0.0.4"
115-
test:
116-
- "provider-qrcode-install"
117-
- "provider-upgrade"
118-
- "provider-upgrade-k8s"
119-
- "provider-decentralized-k8s"
120-
- "provider-k3s-disabled"
121-
- "encryption-local"
122-
- "encryption-remote-auto"
123-
- "encryption-remote-static"
124-
- "encryption-remote-https-pinned"
125-
- "encryption-remote-https-bad-cert"
126112
include:
127-
- base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
128-
test: "provider-upgrade-latest-k8s-with-kubernetes"
113+
- test: "provider-qrcode-install"
114+
- test: "provider-upgrade"
115+
- test: "provider-upgrade-k8s"
116+
- test: "provider-decentralized-k8s"
117+
- test: "provider-k3s-disabled"
118+
- test: "encryption-local"
119+
- test: "encryption-remote-auto"
120+
- test: "encryption-remote-static"
121+
- test: "encryption-remote-https-pinned"
122+
- test: "encryption-remote-https-bad-cert"
123+
- test: "provider-upgrade-latest-k8s-with-kubernetes"
129124
release-matcher: "kairos-hadron-0.0.1-standard-amd64-generic-*k3sv*.iso"

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

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
permissions: read-all
88
jobs:
99
core:
10-
name: ${{ matrix.base_image }}
10+
name: ${{ matrix.image_name }}
1111
uses: kairos-io/kairos-factory-action/.github/workflows/reusable-factory.yaml@84ea9b020bdd470081b235a1a99147a98d32c989 # v1.1.1
1212
secrets:
1313
registry_username: ${{ secrets.QUAY_USERNAME }}
@@ -29,15 +29,31 @@ jobs:
2929
cleanup: [true]
3030
grype: [true]
3131
include:
32+
- image_name: "hadron"
33+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
34+
model: "generic"
35+
cleanup: true
36+
grype: true
37+
custom_job_name_format: "core-arm64-generic"
38+
- image_name: "hadron"
39+
base_image: "ghcr.io/kairos-io/hadron:v0.0.4"
40+
model: "rpi4"
41+
cleanup: true
42+
grype: true
43+
custom_job_name_format: "core-arm64-rpi4"
3244
- model: "nvidia-jetson-agx-orin"
45+
image_name: "ubuntu:22.04"
3346
base_image: "ubuntu:22.04"
3447
cleanup: true
3548
grype: true
49+
custom_job_name_format: ""
3650
- model: "nvidia-jetson-orin-nx"
51+
image_name: "ubuntu:22.04"
3752
base_image: "ubuntu:22.04"
3853
security_scan_mode: "report-only"
3954
cleanup: true
4055
grype: false # too many vulns under the L4T rootfs
56+
custom_job_name_format: ""
4157
with:
4258
auroraboot_version: "v0.19.4"
4359
dockerfile_path: "images/Dockerfile"
@@ -53,6 +69,7 @@ jobs:
5369
trivy: true
5470
trivy_sarif: true
5571
security_scan_mode: ${{ matrix.security_scan_mode }}
72+
custom_job_name_format: ${{ matrix.custom_job_name_format }}
5673
list_release_artifacts: true
5774
cosign: true
5875
release: true
@@ -85,7 +102,7 @@ jobs:
85102
' | jq -c '.')
86103
echo "kubernetes_versions=$kubernetes_versions" >> $GITHUB_OUTPUT
87104
standard:
88-
name: ${{ matrix.base_image }}
105+
name: ${{ matrix.image_name }}
89106
uses: kairos-io/kairos-factory-action/.github/workflows/reusable-factory.yaml@84ea9b020bdd470081b235a1a99147a98d32c989 # v1.1.1
90107
secrets:
91108
registry_username: ${{ secrets.QUAY_USERNAME }}
@@ -106,19 +123,33 @@ jobs:
106123
model:
107124
- "generic"
108125
- "rpi4"
126+
image_name:
127+
- "hadron"
109128
security_scan_mode: ["enforce"]
110129
cleanup: [false]
111130
grype: [true]
131+
custom_job_name_format:
132+
- "standard-arm64-generic-k3s"
133+
- "standard-arm64-rpi4-k3s"
134+
exclude:
135+
- model: "generic"
136+
custom_job_name_format: "standard-arm64-rpi4-k3s"
137+
- model: "rpi4"
138+
custom_job_name_format: "standard-arm64-generic-k3s"
112139
include:
113140
- model: "nvidia-jetson-agx-orin"
141+
image_name: "ubuntu:22.04"
114142
base_image: "ubuntu:22.04"
115143
cleanup: true
116144
grype: true
145+
custom_job_name_format: ""
117146
- model: "nvidia-jetson-orin-nx"
147+
image_name: "ubuntu:22.04"
118148
base_image: "ubuntu:22.04"
119149
security_scan_mode: "report-only"
120150
cleanup: true
121151
grype: false # too many vulns under the L4T rootfs
152+
custom_job_name_format: ""
122153
with:
123154
auroraboot_version: "v0.19.4"
124155
dockerfile_path: "images/Dockerfile"
@@ -137,6 +168,7 @@ jobs:
137168
trivy: true
138169
trivy_sarif: true
139170
security_scan_mode: ${{ matrix.security_scan_mode }}
171+
custom_job_name_format: ${{ matrix.custom_job_name_format }}
140172
list_release_artifacts: true
141173
cosign: true
142174
release: true

0 commit comments

Comments
 (0)