diff options
| author | Guillaume Tucker <guillaume.tucker@collabora.com> | 2019-08-29 09:36:28 +0100 |
|---|---|---|
| committer | Guillaume Tucker <guillaume.tucker@collabora.com> | 2019-08-30 08:45:16 +0100 |
| commit | 93198a75f792892cb2ed431d8fc81f6e5e0ef468 (patch) | |
| tree | 58b969646b14ad1dafa8b8cf1d9d353906da819e /test-configs.yaml | |
| parent | c7f237fc06dd98fa3e11600ccf2a8734cdbb72dc (diff) | |
test-configs.yaml: refactor QEMU variants and UEFI test plans
Rather than having UEFI test plans for each GIC version, create QEMU
variants with different GIC versions and run a single UEFI test plan
in each arch for each QEMU variant.
Suggested-by: Corentin LABBE <clabbe@baylibre.com>
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Diffstat (limited to 'test-configs.yaml')
| -rw-r--r-- | test-configs.yaml | 84 |
1 files changed, 52 insertions, 32 deletions
diff --git a/test-configs.yaml b/test-configs.yaml index 6444f62..c7dd6c8 100644 --- a/test-configs.yaml +++ b/test-configs.yaml @@ -139,47 +139,31 @@ test_plans: sleep: rootfs: debian_buster_ramdisk - uefi-arm-gicv2: + uefi_arm: rootfs: buildroot_ramdisk pattern: 'boot/generic-qemu-boot-template.jinja2' params: - qemu_machine: 'virt,gic-version=2' bios_url: 'https://storage.kernelci.org/images/uefi/111bbcf87621/QEMU_EFI.fd-ARM-RELEASE-111bbcf87621' - uefi-arm-gicv3: + uefi_arm64: rootfs: buildroot_ramdisk pattern: 'boot/generic-qemu-boot-template.jinja2' params: - qemu_machine: 'virt,gic-version=3' - bios_url: 'https://storage.kernelci.org/images/uefi/111bbcf87621/QEMU_EFI.fd-ARM-RELEASE-111bbcf87621' - - uefi-arm64-gicv2: - rootfs: buildroot_ramdisk - pattern: 'boot/generic-qemu-boot-template.jinja2' - params: - qemu_machine: 'virt,gic-version=2' - bios_url: 'https://storage.kernelci.org/images/uefi/111bbcf87621/QEMU_EFI.fd-AARCH64-RELEASE-111bbcf87621' - - uefi-arm64-gicv3: - rootfs: buildroot_ramdisk - pattern: 'boot/generic-qemu-boot-template.jinja2' - params: - qemu_machine: 'virt,gic-version=3' bios_url: 'https://storage.kernelci.org/images/uefi/111bbcf87621/QEMU_EFI.fd-AARCH64-RELEASE-111bbcf87621' - uefi-x86_64: + uefi_x86_64: rootfs: buildroot_ramdisk pattern: 'boot/generic-qemu-boot-template.jinja2' params: bios_url: 'https://storage.kernelci.org/images/uefi/111bbcf87621/OVMF.fd-X64-RELEASE-111bbcf87621' - uefi-x86_i386: + uefi_i386: rootfs: buildroot_ramdisk pattern: 'boot/generic-qemu-boot-template.jinja2' params: bios_url: 'https://storage.kernelci.org/images/uefi/111bbcf87621/OVMF.fd-IA32-RELEASE-111bbcf87621' - uefi-x86-mixed: + uefi_x86-mixed: rootfs: buildroot_ramdisk pattern: 'boot/generic-qemu-boot-template.jinja2' params: @@ -761,7 +745,20 @@ device_types: - whitelist: {defconfig: ['defconfig']} - blacklist: {kernel: ['v3.']} - qemu_arm: + qemu_arm-virt-gicv2: + base_name: qemu + mach: qemu + arch: arm + boot_method: qemu + context: + arch: arm + cpu: 'cortex-a15' + guestfs_interface: 'virtio' + machine: 'virt,gic-version=2' + filters: + - whitelist: {defconfig: ['multi_v7_defconfig', 'vexpress_defconfig']} + + qemu_arm-virt-gicv3: base_name: qemu mach: qemu arch: arm @@ -770,10 +767,11 @@ device_types: arch: arm cpu: 'cortex-a15' guestfs_interface: 'virtio' + machine: 'virt,gic-version=3' filters: - whitelist: {defconfig: ['multi_v7_defconfig', 'vexpress_defconfig']} - qemu_arm64: + qemu_arm64-virt-gicv2: base_name: qemu mach: qemu arch: arm64 @@ -782,6 +780,20 @@ device_types: arch: arm64 cpu: 'cortex-a57' guestfs_interface: 'virtio' + machine: 'virt,gic-version=2' + filters: + - whitelist: {defconfig: ['defconfig']} + + qemu_arm64-virt-gicv3: + base_name: qemu + mach: qemu + arch: arm64 + boot_method: qemu + context: + arch: arm64 + cpu: 'cortex-a57' + guestfs_interface: 'virtio' + machine: 'virt,gic-version=3' filters: - whitelist: {defconfig: ['defconfig']} @@ -1357,34 +1369,42 @@ test_configs: - device_type: qcom-qdf2400 test_plans: [boot] - - device_type: qemu_arm + - device_type: qemu_arm-virt-gicv2 + test_plans: + - boot_qemu + - uefi_arm + + - device_type: qemu_arm-virt-gicv3 test_plans: - boot_qemu - simple_qemu - - uefi-arm-gicv2 - - uefi-arm-gicv3 + - uefi_arm - v4l2_compliance_qemu_vivid - - device_type: qemu_arm64 + - device_type: qemu_arm64-virt-gicv2 + test_plans: + - boot_qemu + - uefi_arm64 + + - device_type: qemu_arm64-virt-gicv3 test_plans: - boot_qemu - simple_qemu - - uefi-arm64-gicv2 - - uefi-arm64-gicv3 + - uefi_arm64 - v4l2_compliance_qemu_vivid - device_type: qemu_i386 test_plans: - boot - - uefi-x86_i386 + - uefi_i386 - simple_qemu - device_type: qemu_x86_64 test_plans: - boot_qemu - simple_qemu - - uefi-x86_64 - - uefi-x86-mixed + - uefi_x86_64 + - uefi_x86-mixed - v4l2_compliance_qemu_vivid - device_type: r8a7791-porter |