Re: [PATCH 3/3] CI: Add {adl,zen3p}-pvshim-* tests

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

On 21/10/2024 3:41 pm, Andrew Cooper wrote:
> On 21/10/2024 3:35 pm, Andrew Cooper wrote:
>> GitlabCI has no testing of Xen's PVH entrypoint.  Fix this.
>>
>> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
>> ---
>> CC: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
>> CC: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx>
>> CC: Anthony PERARD <anthony.perard@xxxxxxxxxx>
>> CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
>> CC: Michal Orzel <michal.orzel@xxxxxxx>
>> CC: Doug Goldstein <cardoe@xxxxxxxxxx>
>>
>> OSSTest (which is disappearing imminently) found a pvshim bug in the
>> hyperlaunch series, and I found a second shortly after while trying to take
>> more of the series.
>>
>> https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/1505518838
>> ---
>>  automation/gitlab-ci/test.yaml     | 16 ++++++++++++++++
>>  automation/scripts/qubes-x86-64.sh | 10 ++++++++--
>>  2 files changed, 24 insertions(+), 2 deletions(-)
>>
>> diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
>> index b27c2be17487..e76a37bef32d 100644
>> --- a/automation/gitlab-ci/test.yaml
>> +++ b/automation/gitlab-ci/test.yaml
>> @@ -240,6 +240,14 @@ adl-pci-hvm-x86-64-gcc-debug:
>>      - *x86-64-test-needs
>>      - alpine-3.18-gcc-debug
>>  
>> +adl-pvshim-x86-64-gcc-debug:
>> +  extends: .adl-x86-64
>> +  script:
>> +    - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE}
>> +  needs:
>> +    - *x86-64-test-needs
>> +    - alpine-3.18-gcc-debug
>> +
>>  zen3p-smoke-x86-64-gcc-debug:
>>    extends: .zen3p-x86-64
>>    script:
>> @@ -272,6 +280,14 @@ zen3p-pci-hvm-x86-64-gcc-debug:
>>      - *x86-64-test-needs
>>      - alpine-3.18-gcc-debug
>>  
>> +zen3p-pvshim-x86-64-gcc-debug:
>> +  extends: .zen3p-x86-64
>> +  script:
>> +    - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE}
>> +  needs:
>> +    - *x86-64-test-needs
>> +    - alpine-3.18-gcc-debug
>> +
>>  qemu-smoke-dom0-arm64-gcc:
>>    extends: .qemu-arm64
>>    script:
>> diff --git a/automation/scripts/qubes-x86-64.sh 
>> b/automation/scripts/qubes-x86-64.sh
>> index 4b6311efffa8..ace494b938d8 100755
>> --- a/automation/scripts/qubes-x86-64.sh
>> +++ b/automation/scripts/qubes-x86-64.sh
>> @@ -8,6 +8,7 @@ set -ex
>>  #  - dom0pvh-hvm    PVH dom0, HVM domU
>>  #  - pci-hvm        PV dom0,  HVM domU + PCI Passthrough
>>  #  - pci-pv         PV dom0,  PV domU + PCI Passthrough
>> +#  - pvshim         PV dom0,  PVSHIM domU
>>  #  - s3             PV dom0,  S3 suspend/resume
>>  test_variant=$1
>>  
>> @@ -20,8 +21,8 @@ domU_vif="'bridge=xenbr0',"
>>  domU_extra_cfg=
>>  
>>  case "${test_variant}" in
>> -    ### test: smoke test & smoke test PVH & smoke test HVM
>> -    ""|"dom0pvh"|"dom0pvh-hvm")
>> +    ### test: smoke test & smoke test PVH & smoke test HVM & smoke test 
>> PVSHIM
>> +    ""|"dom0pvh"|"dom0pvh-hvm"|"pvshim")
>>          passed="ping test passed"
>>          domU_check="
>>  ifconfig eth0 192.168.0.2
>> @@ -44,6 +45,11 @@ echo \"${passed}\"
>>  
>>          if [ "${test_variant}" = "dom0pvh-hvm" ]; then
>>              domU_type="hvm"
>> +        elif [ "${test_variant}" = "pvshim" ]; then
>> +            domU_type="pv"
>> +            domU_extra_cfg='
>> +pvshim = 1
>> +'
>>          fi
>>          ;;
>>  
> Bah - serves me right for some last minute refactoring.  The domain type
> should be pvh for pvshim=1 to work.
>
> New pipeline:
> https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/1505540810

And from the same bit of refactoring, a mismatch between
domU_extra_{cfg,config}.  Consolidated on the latter.

https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/8143613752

~Andrew