[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 2/2] automation: add a smoke test for xen.efi on X86


  • To: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>
  • From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
  • Date: Thu, 3 Oct 2024 00:08:50 +0100
  • Autocrypt: addr=andrew.cooper3@xxxxxxxxxx; keydata= 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 6+ahAA==
  • Cc: xen-devel@xxxxxxxxxxxxxxxxxxxx, Doug Goldstein <cardoe@xxxxxxxxxx>
  • Delivery-date: Wed, 02 Oct 2024 23:09:10 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

On 02/10/2024 11:55 pm, Marek Marczykowski-Górecki wrote:
> On Wed, Oct 02, 2024 at 03:22:59PM -0700, Stefano Stabellini wrote:
>> I forgot to reply to one important part below
>>
>>
>> On Wed, 2 Oct 2024, Stefano Stabellini wrote:
>>> On Wed, 2 Oct 2024, Marek Marczykowski-Górecki wrote:
>>>> Check if xen.efi is bootable with an XTF dom0.
>>>>
>>>> The TEST_TIMEOUT is set in the script to override project-global value.
>>>> Setting it in the gitlab yaml file doesn't work, as it's too low
>>>> priority
>>>> (https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence).
>>>>
>>>> The multiboot2+EFI path is tested on hardware tests already.
>>>>
>>>> Signed-off-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
>>>> ---
>>>> This requires rebuilding debian:bookworm container.
>>>>
>>>> The TEST_TIMEOUT issue mentioned above applies to xilix-* jobs too. It's
>>>> not clear to me why the default TEST_TIMEOUT is set at the group level
>>>> instead of in the yaml file, so I'm not adjusting the other places.
>>> Let me premise that now that we use "expect" all successful tests will
>>> terminate as soon as the success condition is met, without waiting for
>>> the test timeout to expire.
>>>
>>> There is a CI/CD variable called TEST_TIMEOUT set at the
>>> gitlab.com/xen-project level. (There is also a check in console.exp in
>>> case TEST_TIMEOUT is not set so that we don't run into problems in case
>>> the CI/CD variable is removed accidentally.) The global TEST_TIMEOUT is
>>> meant to be a high value to account for slow QEMU tests running
>>> potentially on our slowest cloud runners.
>>>
>>> However, for hardware-based tests such as the xilinx-* jobs, we know
>>> that the timeout is supposed to be less than that. The test is running
>>> on real hardware which is considerably faster than QEMU running on our
>>> slowest runners. Basically, the timeout depends on the runner more than
>>> the test. So we override the TEST_TIMEOUT variable for the xilinx-* jobs
>>> providing a lower timeout value.
>>>
>>> The global TEST_TIMEOUT is set to 1500.
>>> The xilinx-* timeout is set to 120 for ARM and 1000 for x86.
>>>
>>> You are welcome to override the TEST_TIMEOUT value for the
>>> hardware-based QubesOS tests. At the same time, given that on success
>>> the timeout is not really used, it is also OK to leave it like this.
>>  
>>  
>>>> ---
>>>>  automation/build/debian/bookworm.dockerfile |  1 +
>>>>  automation/gitlab-ci/test.yaml              |  7 ++++
>>>>  automation/scripts/qemu-smoke-x86-64-efi.sh | 44 +++++++++++++++++++++
>>>>  3 files changed, 52 insertions(+)
>>>>  create mode 100755 automation/scripts/qemu-smoke-x86-64-efi.sh
>>>>
>>>> diff --git a/automation/build/debian/bookworm.dockerfile 
>>>> b/automation/build/debian/bookworm.dockerfile
>>>> index 3dd70cb6b2e3..061114ba522d 100644
>>>> --- a/automation/build/debian/bookworm.dockerfile
>>>> +++ b/automation/build/debian/bookworm.dockerfile
>>>> @@ -46,6 +46,7 @@ RUN apt-get update && \
>>>>          # for test phase, qemu-smoke-* jobs
>>>>          qemu-system-x86 \
>>>>          expect \
>>>> +        ovmf \
>>>>          # for test phase, qemu-alpine-* jobs
>>>>          cpio \
>>>>          busybox-static \
>>>> diff --git a/automation/gitlab-ci/test.yaml 
>>>> b/automation/gitlab-ci/test.yaml
>>>> index 8675016b6a37..74fd3f3109ae 100644
>>>> --- a/automation/gitlab-ci/test.yaml
>>>> +++ b/automation/gitlab-ci/test.yaml
>>>> @@ -463,6 +463,13 @@ qemu-smoke-x86-64-clang-pvh:
>>>>    needs:
>>>>      - debian-bookworm-clang-debug
>>>>  
>>>> +qemu-smoke-x86-64-gcc-efi:
>>>> +  extends: .qemu-x86-64
>>>> +  script:
>>>> +    - ./automation/scripts/qemu-smoke-x86-64-efi.sh pv 2>&1 | tee 
>>>> ${LOGFILE}
>>>> +  needs:
>>>> +    - debian-bookworm-gcc-debug
>>> Given that the script you wrote (thank you!) can also handle pvh, can we
>>> directly add a pvh job to test.yaml too?
> I guess we can, but is xen.efi + PVH dom0 actually different enough to
> worth testing given we already test MB2+EFI + PVH dom0?

Given that its only an XTF dom0, no.  We're only smoke testing the
"native EFI" bits here.

~Andrew



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.