mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-24 23:21:17 +02:00
Merge pull request #697 from flatcar/kai/qemu-serial-console-kola-check
Run kola without --qemu-skip-mangle on Jenkins
This commit is contained in:
commit
892350ba97
3
.github/workflows/run-kola-tests.yaml
vendored
3
.github/workflows/run-kola-tests.yaml
vendored
@ -100,6 +100,9 @@ jobs:
|
|||||||
export QEMU_IMAGE_NAME="/work/flatcar_production_image.bin"
|
export QEMU_IMAGE_NAME="/work/flatcar_production_image.bin"
|
||||||
export QEMU_UEFI_BIOS="/work/flatcar_production_qemu_uefi_efi_code.fd"
|
export QEMU_UEFI_BIOS="/work/flatcar_production_qemu_uefi_efi_code.fd"
|
||||||
export PARALLEL_TESTS=${PARALLEL_ARCH}
|
export PARALLEL_TESTS=${PARALLEL_ARCH}
|
||||||
|
# The runner uses lxc containers for kola, and can't use loopback devices to
|
||||||
|
# prepare the serial console setting - this means that kola may miss some errors
|
||||||
|
export QEMU_KOLA_SKIP_MANGLE=true
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
export MAX_RETRIES=5
|
export MAX_RETRIES=5
|
||||||
|
@ -52,6 +52,9 @@ CONTAINER_IMAGE_ROOT="/home/sdk/build/images"
|
|||||||
QEMU_IMAGE_NAME=${QEMU_IMAGE_NAME:-flatcar_production_image.bin}
|
QEMU_IMAGE_NAME=${QEMU_IMAGE_NAME:-flatcar_production_image.bin}
|
||||||
QEMU_PARALLEL="${PARALLEL_TESTS:-20}"
|
QEMU_PARALLEL="${PARALLEL_TESTS:-20}"
|
||||||
|
|
||||||
|
# Whether kola can use loop devices to capture serial console output and check for error patterns
|
||||||
|
QEMU_KOLA_SKIP_MANGLE="${QEMU_KOLA_SKIP_MANGLE:-}"
|
||||||
|
|
||||||
# BIOS path within the SDK
|
# BIOS path within the SDK
|
||||||
QEMU_BIOS="/usr/share/qemu/bios-256k.bin"
|
QEMU_BIOS="/usr/share/qemu/bios-256k.bin"
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ kola run \
|
|||||||
--qemu-image="${QEMU_IMAGE_NAME}" \
|
--qemu-image="${QEMU_IMAGE_NAME}" \
|
||||||
--tapfile="${CIA_TAPFILE}" \
|
--tapfile="${CIA_TAPFILE}" \
|
||||||
--torcx-manifest="${CIA_TORCX_MANIFEST}" \
|
--torcx-manifest="${CIA_TORCX_MANIFEST}" \
|
||||||
--qemu-skip-mangle \
|
${QEMU_KOLA_SKIP_MANGLE:+--qemu-skip-mangle} \
|
||||||
"${@}"
|
"${@}"
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
|
@ -106,7 +106,7 @@ run_kola_tests() {
|
|||||||
--tapfile="${instance_tapfile}" \
|
--tapfile="${instance_tapfile}" \
|
||||||
--torcx-manifest="${CIA_TORCX_MANIFEST}" \
|
--torcx-manifest="${CIA_TORCX_MANIFEST}" \
|
||||||
--update-payload=tmp/flatcar_test_update.gz \
|
--update-payload=tmp/flatcar_test_update.gz \
|
||||||
--qemu-skip-mangle \
|
${QEMU_KOLA_SKIP_MANGLE:+--qemu-skip-mangle} \
|
||||||
cl.update.payload
|
cl.update.payload
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user