Skip to content

Commit f043f71

Browse files
committed
kernelci.org: build new Docker images with kci_docker
Replace the call to build-and-push.sh with the new kci_docker command. Signed-off-by: Guillaume Tucker <[email protected]>
1 parent a1b346a commit f043f71

File tree

1 file changed

+31
-10
lines changed

1 file changed

+31
-10
lines changed

kernelci.org

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,18 +191,39 @@ cmd_website() {
191191
}
192192

193193
cmd_docker() {
194-
cd checkout/kernelci-core/config/docker
194+
cd checkout/kernelci-core/config/docker-new
195195
echo "Re-building Docker images"
196-
./build-and-push.sh -n
197-
echo "Pushing Docker images"
198-
while true; do
199-
if ./build-and-push.sh -p; then
200-
break
201-
else
202-
echo "Retrying..."
203-
sleep 3
204-
fi
196+
197+
args="build --push --verbose"
198+
199+
# KernelCI tools
200+
./kci_docker $args kernelci
201+
./kci_docker $args k8s --fragment=kernelci
202+
203+
# Compiler toolchains
204+
for clang in clang-11 clang-12 clang-13 clang-14 clang-15 clang-16; do
205+
./kci_docker $args $clang --fragment=kselftest --fragment=kernelci
206+
done
207+
for arch in arc arm armv5 arm64 mips riscv64 x86; do
208+
./kci_docker $args gcc-10 --arch $arch \
209+
--fragment=kselftest --fragment=kernelci
205210
done
211+
# missing -dev packages for sparc64
212+
./kci_docker $args gcc-10 --arch sparc --fragment=kernelci
213+
# only x86 is useful for KUnit (for now)
214+
./kci_docker $args gcc-10 --arch x86 --fragment=kunit --fragment=kernelci
215+
216+
# rootfs
217+
./kci_docker $args buildroot --fragment=kernelci
218+
./kci_docker $args debos --fragment=kernelci
219+
220+
# QEMU
221+
./kci_docker $args qemu
222+
223+
# Other tools
224+
./kci_docker $args cvehound --fragment=kernelci
225+
./kci_docker $args dt-validation # --fragment=kernelci (PyYAML conflict)
226+
206227
cd -
207228
}
208229

0 commit comments

Comments
 (0)