Skip to content

Commit d87447c

Browse files
committed
fix(docker/k8s): Fix image names
This commit depends on PR kernelci/kernelci-core#2705 Signed-off-by: Denys Fedoryshchenko <denys.f@collabora.com>
1 parent f56be0d commit d87447c

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

config/jobs-chromeos.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ _anchors:
33
kbuild-gcc-12-arm64-chromeos: &kbuild-gcc-12-arm64-chromeos-job
44
template: kbuild.jinja2
55
kind: kbuild
6-
image: kernelci/staging-gcc-12:arm64-kselftest-kernelci
6+
image: ghcr.io/kernelci/{image_prefix}gcc-12:arm64-kselftest-kernelci
77
params: &kbuild-gcc-12-arm64-chromeos-params
88
arch: arm64
99
compiler: gcc-12
@@ -22,7 +22,7 @@ _anchors:
2222

2323
kbuild-gcc-12-x86-chromeos: &kbuild-gcc-12-x86-chromeos-job
2424
<<: *kbuild-gcc-12-arm64-chromeos-job
25-
image: kernelci/staging-gcc-12:x86-kselftest-kernelci
25+
image: ghcr.io/kernelci/{image_prefix}gcc-12:x86-kselftest-kernelci
2626
params: &kbuild-gcc-12-x86-chromeos-params
2727
arch: x86_64
2828
compiler: gcc-12

config/pipeline.yaml

+15-15
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ _anchors:
3737

3838
kbuild-clang-17-arm64-job: &kbuild-clang-17-arm64-job
3939
<<: *kbuild-job
40-
image: kernelci/staging-clang-17:arm64-kselftest-kernelci
40+
image: ghcr.io/kernelci/{image_prefix}clang-17:arm64-kselftest-kernelci
4141
params: &kbuild-clang-17-arm64-params
4242
arch: arm64
4343
compiler: clang-17
@@ -46,15 +46,15 @@ _anchors:
4646

4747
kbuild-clang-17-x86-job: &kbuild-clang-17-x86-job
4848
<<: *kbuild-job
49-
image: kernelci/staging-clang-17:x86-kselftest-kernelci
49+
image: ghcr.io/kernelci/{image_prefix}clang-17:x86-kselftest-kernelci
5050
params: &kbuild-clang-17-x86-params
5151
arch: x86_64
5252
compiler: clang-17
5353
defconfig: x86_64_defconfig
5454

5555
kbuild-gcc-12-arm64-job: &kbuild-gcc-12-arm64-job
5656
<<: *kbuild-job
57-
image: kernelci/staging-gcc-12:arm64-kselftest-kernelci
57+
image: ghcr.io/kernelci/{image_prefix}gcc-12:arm64-kselftest-kernelci
5858
params: &kbuild-gcc-12-arm64-params
5959
arch: arm64
6060
compiler: gcc-12
@@ -63,7 +63,7 @@ _anchors:
6363

6464
kbuild-gcc-12-x86-job: &kbuild-gcc-12-x86-job
6565
<<: *kbuild-job
66-
image: kernelci/staging-gcc-12:x86-kselftest-kernelci
66+
image: ghcr.io/kernelci/{image_prefix}gcc-12:x86-kselftest-kernelci
6767
params: &kbuild-gcc-12-x86-params
6868
arch: x86_64
6969
compiler: gcc-12
@@ -287,7 +287,7 @@ jobs:
287287

288288
kbuild-clang-17-arm: &kbuild-clang-17-arm-job
289289
<<: *kbuild-job
290-
image: kernelci/staging-clang-17:arm-kselftest-kernelci
290+
image: ghcr.io/kernelci/{image_prefix}clang-17:arm-kselftest-kernelci
291291
params: &kbuild-clang-17-arm-params
292292
arch: arm
293293
compiler: clang-17
@@ -447,7 +447,7 @@ jobs:
447447

448448
kbuild-clang-17-i386: &kbuild-clang-17-i386-job
449449
<<: *kbuild-job
450-
image: kernelci/staging-clang-17:x86-kselftest-kernelci
450+
image: ghcr.io/kernelci/{image_prefix}clang-17:x86-kselftest-kernelci
451451
params: &kbuild-clang-17-i386-params
452452
arch: i386
453453
compiler: clang-17
@@ -480,7 +480,7 @@ jobs:
480480

481481
kbuild-clang-17-riscv: &kbuild-clang-17-riscv-job
482482
<<: *kbuild-job
483-
image: kernelci/staging-clang-17:riscv64-kselftest-kernelci
483+
image: ghcr.io/kernelci/{image_prefix}clang-17:riscv64-kselftest-kernelci
484484
params: &kbuild-clang-17-riscv-params
485485
arch: riscv
486486
compiler: clang-17
@@ -582,7 +582,7 @@ jobs:
582582
# Default config and build only job
583583
kbuild-gcc-12-arc-build-only: &kbuild-gcc-12-arc-job
584584
<<: *kbuild-job
585-
image: kernelci/staging-gcc-12:arc-kselftest-kernelci
585+
image: ghcr.io/kernelci/{image_prefix}gcc-12:arc-kselftest-kernelci
586586
params: &kbuild-gcc-12-arc-params
587587
arch: arc
588588
compiler: gcc-12
@@ -632,7 +632,7 @@ jobs:
632632

633633
kbuild-gcc-12-arm: &kbuild-gcc-12-arm-job
634634
<<: *kbuild-job
635-
image: kernelci/staging-gcc-12:arm-kselftest-kernelci
635+
image: ghcr.io/kernelci/{image_prefix}gcc-12:arm-kselftest-kernelci
636636
params: &kbuild-gcc-12-arm-params
637637
arch: arm
638638
compiler: gcc-12
@@ -1083,7 +1083,7 @@ jobs:
10831083

10841084
kbuild-gcc-12-i386: &kbuild-gcc-12-i386-job
10851085
<<: *kbuild-job
1086-
image: kernelci/staging-gcc-12:x86-kselftest-kernelci
1086+
image: ghcr.io/kernelci/{image_prefix}gcc-12:x86-kselftest-kernelci
10871087
params: &kbuild-gcc-12-i386-params
10881088
arch: i386
10891089
compiler: gcc-12
@@ -1165,7 +1165,7 @@ jobs:
11651165

11661166
kbuild-gcc-12-mips-32r2el_defconfig: &kbuild-gcc-12-mips-job
11671167
<<: *kbuild-job
1168-
image: kernelci/staging-gcc-12:mips-kselftest-kernelci
1168+
image: ghcr.io/kernelci/{image_prefix}gcc-12:mips-kselftest-kernelci
11691169
params: &kbuild-gcc-12-mips-params
11701170
arch: mips
11711171
compiler: gcc-12
@@ -1217,7 +1217,7 @@ jobs:
12171217

12181218
kbuild-gcc-12-riscv: &kbuild-gcc-12-riscv-job
12191219
<<: *kbuild-job
1220-
image: kernelci/staging-gcc-12:riscv64-kselftest-kernelci
1220+
image: ghcr.io/kernelci/{image_prefix}gcc-12:riscv64-kselftest-kernelci
12211221
params: &kbuild-gcc-12-riscv-params
12221222
arch: riscv
12231223
compiler: gcc-12
@@ -1290,7 +1290,7 @@ jobs:
12901290

12911291
kbuild-gcc-12-um:
12921292
<<: *kbuild-job
1293-
image: kernelci/staging-gcc-12:x86-kselftest-kernelci
1293+
image: ghcr.io/kernelci/{image_prefix}gcc-12:x86-kselftest-kernelci
12941294
params:
12951295
arch: um
12961296
compiler: gcc-12
@@ -1544,7 +1544,7 @@ jobs:
15441544
kunit: &kunit-job
15451545
template: kunit.jinja2
15461546
kind: job
1547-
image: kernelci/staging-gcc-12:x86-kunit-kernelci
1547+
image: ghcr.io/kernelci/{image_prefix}gcc-12:x86-kunit-kernelci
15481548
kcidb_test_suite: kunit
15491549

15501550
kunit-x86_64:
@@ -1555,7 +1555,7 @@ jobs:
15551555
kver:
15561556
template: kver.jinja2
15571557
kind: test
1558-
image: kernelci/staging-kernelci
1558+
image: kernelci/{image_prefix}kernelci
15591559
kcidb_test_suite: kernelci_kver
15601560

15611561
ltp-cap-bounds:

0 commit comments

Comments
 (0)