diff mbox series

[XEN,1/2] automation: switch GitLab x86 smoke test to use PV 64bit binary

Message ID 20210930161720.825098-2-anthony.perard@citrix.com (mailing list archive)
State New, archived
Headers show
Series Fixing gitlab CI tests | expand

Commit Message

Anthony PERARD Sept. 30, 2021, 4:17 p.m. UTC
From: Anthony PERARD <anthony.perard@gmail.com>

Xen is now built without CONFIG_PV32 by default and thus test jobs
"qemu-smoke-x86-64-gcc" and "qemu-smoke-x86-64-clang" fails because
they are using XTF's "test-pv32pae-example" which is an hello word
32bit PV guest.

As we are looking for whether Xen boot or not with a quick smoke test,
we will use "test-pv64-example" instead, which is a hello word 64bit
PV guest.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
---
 automation/scripts/qemu-smoke-x86-64.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andrew Cooper Sept. 30, 2021, 4:20 p.m. UTC | #1
On 30/09/2021 17:17, Anthony PERARD wrote:
> From: Anthony PERARD <anthony.perard@gmail.com>
>
> Xen is now built without CONFIG_PV32 by default and thus test jobs
> "qemu-smoke-x86-64-gcc" and "qemu-smoke-x86-64-clang" fails because
> they are using XTF's "test-pv32pae-example" which is an hello word
> 32bit PV guest.
>
> As we are looking for whether Xen boot or not with a quick smoke test,
> we will use "test-pv64-example" instead, which is a hello word 64bit
> PV guest.
>
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

> ---
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
>  automation/scripts/qemu-smoke-x86-64.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/automation/scripts/qemu-smoke-x86-64.sh b/automation/scripts/qemu-smoke-x86-64.sh
> index 09152e3e9ca1..4b176c508dec 100755
> --- a/automation/scripts/qemu-smoke-x86-64.sh
> +++ b/automation/scripts/qemu-smoke-x86-64.sh
> @@ -16,7 +16,7 @@ cd xtf && make -j$(nproc) && cd -
>  
>  case $variant in
>      pvh) k=test-hvm32pae-example extra="dom0-iommu=none dom0=pvh" ;;

TBH, I'd be tempted to change to hvm64 here too for consistency.  I can
fix on commit if you're happy.

~Andrew

> -    *)   k=test-pv32pae-example  extra= ;;
> +    *)   k=test-pv64-example     extra= ;;
>  esac
>  
>  rm -f smoke.serial
Anthony PERARD Sept. 30, 2021, 4:29 p.m. UTC | #2
On Thu, Sep 30, 2021 at 05:20:31PM +0100, Andrew Cooper wrote:
> On 30/09/2021 17:17, Anthony PERARD wrote:
> > From: Anthony PERARD <anthony.perard@gmail.com>
> >
> > Xen is now built without CONFIG_PV32 by default and thus test jobs
> > "qemu-smoke-x86-64-gcc" and "qemu-smoke-x86-64-clang" fails because
> > they are using XTF's "test-pv32pae-example" which is an hello word
> > 32bit PV guest.
> >
> > As we are looking for whether Xen boot or not with a quick smoke test,
> > we will use "test-pv64-example" instead, which is a hello word 64bit
> > PV guest.
> >
> > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> 
> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
> 
> > ---
> > Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> > ---
> >  automation/scripts/qemu-smoke-x86-64.sh | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/automation/scripts/qemu-smoke-x86-64.sh b/automation/scripts/qemu-smoke-x86-64.sh
> > index 09152e3e9ca1..4b176c508dec 100755
> > --- a/automation/scripts/qemu-smoke-x86-64.sh
> > +++ b/automation/scripts/qemu-smoke-x86-64.sh
> > @@ -16,7 +16,7 @@ cd xtf && make -j$(nproc) && cd -
> >  
> >  case $variant in
> >      pvh) k=test-hvm32pae-example extra="dom0-iommu=none dom0=pvh" ;;
> 
> TBH, I'd be tempted to change to hvm64 here too for consistency.  I can
> fix on commit if you're happy.

Sound good to me, I haven't tested it, but I guess it should work.

Thanks,
diff mbox series

Patch

diff --git a/automation/scripts/qemu-smoke-x86-64.sh b/automation/scripts/qemu-smoke-x86-64.sh
index 09152e3e9ca1..4b176c508dec 100755
--- a/automation/scripts/qemu-smoke-x86-64.sh
+++ b/automation/scripts/qemu-smoke-x86-64.sh
@@ -16,7 +16,7 @@  cd xtf && make -j$(nproc) && cd -
 
 case $variant in
     pvh) k=test-hvm32pae-example extra="dom0-iommu=none dom0=pvh" ;;
-    *)   k=test-pv32pae-example  extra= ;;
+    *)   k=test-pv64-example     extra= ;;
 esac
 
 rm -f smoke.serial