* [XEN PATCH 0/2] Fixing gitlab CI tests
@ 2021-09-30 16:17 Anthony PERARD
2021-09-30 16:17 ` [XEN PATCH 1/2] automation: switch GitLab x86 smoke test to use PV 64bit binary Anthony PERARD
2021-09-30 16:17 ` [XEN PATCH 2/2] automation: Add qemu to debian:stretch container for smoke test Anthony PERARD
0 siblings, 2 replies; 7+ messages in thread
From: Anthony PERARD @ 2021-09-30 16:17 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Doug Goldstein
Patch series available in this git branch:
https://xenbits.xen.org/git-http/people/aperard/xen-unstable.git br.gitlab-pv32-test-fix-v1
Fixing tests due to CONFIG_PV32 missing.
debian:stretch container needs updating due to certificate issue, so also
install qemu in the container.
Anthony PERARD (2):
automation: switch GitLab x86 smoke test to use PV 64bit binary
automation: Add qemu to debian:stretch container for smoke test
automation/build/debian/stretch.dockerfile | 2 ++
automation/scripts/qemu-smoke-x86-64.sh | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
--
Anthony PERARD
^ permalink raw reply [flat|nested] 7+ messages in thread
* [XEN PATCH 1/2] automation: switch GitLab x86 smoke test to use PV 64bit binary
2021-09-30 16:17 [XEN PATCH 0/2] Fixing gitlab CI tests Anthony PERARD
@ 2021-09-30 16:17 ` Anthony PERARD
2021-09-30 16:20 ` Andrew Cooper
2021-09-30 16:17 ` [XEN PATCH 2/2] automation: Add qemu to debian:stretch container for smoke test Anthony PERARD
1 sibling, 1 reply; 7+ messages in thread
From: Anthony PERARD @ 2021-09-30 16:17 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Anthony PERARD, Andrew Cooper, Doug Goldstein
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(-)
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
--
Anthony PERARD
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [XEN PATCH 2/2] automation: Add qemu to debian:stretch container for smoke test
2021-09-30 16:17 [XEN PATCH 0/2] Fixing gitlab CI tests Anthony PERARD
2021-09-30 16:17 ` [XEN PATCH 1/2] automation: switch GitLab x86 smoke test to use PV 64bit binary Anthony PERARD
@ 2021-09-30 16:17 ` Anthony PERARD
2021-09-30 17:05 ` Andrew Cooper
1 sibling, 1 reply; 7+ messages in thread
From: Anthony PERARD @ 2021-09-30 16:17 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Anthony PERARD, Doug Goldstein
From: Anthony PERARD <anthony.perard@gmail.com>
We can add qemu into the container so that there's no need to install
it everytime we run a test.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
Also, smoke tests stopped working as of today due to outdated
root certificate, so container needs to be updated anyway.
fatal: unable to access 'https://xenbits.xen.org/git-http/xtf.git/': server certificate verification failed.
I haven't push the container yet, I've only pushed it as
debian:tmp-stretch for testing it.
---
automation/build/debian/stretch.dockerfile | 2 ++
automation/scripts/qemu-smoke-x86-64.sh | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
index e2ee14e2017c..da6aa874dd70 100644
--- a/automation/build/debian/stretch.dockerfile
+++ b/automation/build/debian/stretch.dockerfile
@@ -47,6 +47,8 @@ RUN apt-get update && \
nasm \
gnupg \
apt-transport-https \
+ # for test phase, qemu-smoke-* jobs
+ qemu-system-x86 \
&& \
apt-get autoremove -y && \
apt-get clean && \
diff --git a/automation/scripts/qemu-smoke-x86-64.sh b/automation/scripts/qemu-smoke-x86-64.sh
index 4b176c508dec..8ac065491c75 100755
--- a/automation/scripts/qemu-smoke-x86-64.sh
+++ b/automation/scripts/qemu-smoke-x86-64.sh
@@ -6,9 +6,11 @@ set -ex
variant=$1
# Install QEMU
-export DEBIAN_FRONTENT=noninteractive
-apt-get -qy update
-apt-get -qy install qemu-system-x86
+if ! type qemu-system-x86_64; then
+ export DEBIAN_FRONTENT=noninteractive
+ apt-get -qy update
+ apt-get -qy install qemu-system-x86
+fi
# Clone and build XTF
git clone https://xenbits.xen.org/git-http/xtf.git
--
Anthony PERARD
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [XEN PATCH 1/2] automation: switch GitLab x86 smoke test to use PV 64bit binary
2021-09-30 16:17 ` [XEN PATCH 1/2] automation: switch GitLab x86 smoke test to use PV 64bit binary Anthony PERARD
@ 2021-09-30 16:20 ` Andrew Cooper
2021-09-30 16:29 ` Anthony PERARD
0 siblings, 1 reply; 7+ messages in thread
From: Andrew Cooper @ 2021-09-30 16:20 UTC (permalink / raw)
To: Anthony PERARD, xen-devel; +Cc: Anthony PERARD, Doug Goldstein
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [XEN PATCH 1/2] automation: switch GitLab x86 smoke test to use PV 64bit binary
2021-09-30 16:20 ` Andrew Cooper
@ 2021-09-30 16:29 ` Anthony PERARD
0 siblings, 0 replies; 7+ messages in thread
From: Anthony PERARD @ 2021-09-30 16:29 UTC (permalink / raw)
To: Andrew Cooper; +Cc: xen-devel, Anthony PERARD, Doug Goldstein
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,
--
Anthony PERARD
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [XEN PATCH 2/2] automation: Add qemu to debian:stretch container for smoke test
2021-09-30 16:17 ` [XEN PATCH 2/2] automation: Add qemu to debian:stretch container for smoke test Anthony PERARD
@ 2021-09-30 17:05 ` Andrew Cooper
2021-10-01 8:21 ` Anthony PERARD
0 siblings, 1 reply; 7+ messages in thread
From: Andrew Cooper @ 2021-09-30 17:05 UTC (permalink / raw)
To: Anthony PERARD, xen-devel; +Cc: Anthony PERARD, Doug Goldstein
On 30/09/2021 17:17, Anthony PERARD wrote:
> From: Anthony PERARD <anthony.perard@gmail.com>
>
> We can add qemu into the container so that there's no need to install
> it everytime we run a test.
>
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
>
> Also, smoke tests stopped working as of today due to outdated
> root certificate, so container needs to be updated anyway.
> fatal: unable to access 'https://xenbits.xen.org/git-http/xtf.git/': server certificate verification failed.
>
> I haven't push the container yet, I've only pushed it as
> debian:tmp-stretch for testing it.
> ---
> automation/build/debian/stretch.dockerfile | 2 ++
> automation/scripts/qemu-smoke-x86-64.sh | 8 +++++---
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
> index e2ee14e2017c..da6aa874dd70 100644
> --- a/automation/build/debian/stretch.dockerfile
> +++ b/automation/build/debian/stretch.dockerfile
> @@ -47,6 +47,8 @@ RUN apt-get update && \
> nasm \
> gnupg \
> apt-transport-https \
> + # for test phase, qemu-smoke-* jobs
> + qemu-system-x86 \
> && \
> apt-get autoremove -y && \
> apt-get clean && \
> diff --git a/automation/scripts/qemu-smoke-x86-64.sh b/automation/scripts/qemu-smoke-x86-64.sh
> index 4b176c508dec..8ac065491c75 100755
> --- a/automation/scripts/qemu-smoke-x86-64.sh
> +++ b/automation/scripts/qemu-smoke-x86-64.sh
> @@ -6,9 +6,11 @@ set -ex
> variant=$1
>
> # Install QEMU
> -export DEBIAN_FRONTENT=noninteractive
> -apt-get -qy update
> -apt-get -qy install qemu-system-x86
> +if ! type qemu-system-x86_64; then
> + export DEBIAN_FRONTENT=noninteractive
> + apt-get -qy update
> + apt-get -qy install qemu-system-x86
> +fi
I'd just delete this all. It's wrong for running smoke tests in other
containers anyway.
Can fix commit too.
~Andrew
>
> # Clone and build XTF
> git clone https://xenbits.xen.org/git-http/xtf.git
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [XEN PATCH 2/2] automation: Add qemu to debian:stretch container for smoke test
2021-09-30 17:05 ` Andrew Cooper
@ 2021-10-01 8:21 ` Anthony PERARD
0 siblings, 0 replies; 7+ messages in thread
From: Anthony PERARD @ 2021-10-01 8:21 UTC (permalink / raw)
To: Andrew Cooper; +Cc: xen-devel, Anthony PERARD, Doug Goldstein
On Thu, Sep 30, 2021 at 06:05:44PM +0100, Andrew Cooper wrote:
> On 30/09/2021 17:17, Anthony PERARD wrote:
> > --- a/automation/scripts/qemu-smoke-x86-64.sh
> > +++ b/automation/scripts/qemu-smoke-x86-64.sh
> > @@ -6,9 +6,11 @@ set -ex
> > variant=$1
> >
> > # Install QEMU
> > -export DEBIAN_FRONTENT=noninteractive
> > -apt-get -qy update
> > -apt-get -qy install qemu-system-x86
> > +if ! type qemu-system-x86_64; then
> > + export DEBIAN_FRONTENT=noninteractive
> > + apt-get -qy update
> > + apt-get -qy install qemu-system-x86
> > +fi
>
> I'd just delete this all. It's wrong for running smoke tests in other
> containers anyway.
>
> Can fix commit too.
Sounds good, thanks. In that case, I need to push the updated container
before we commit the patch.
Cheers,
--
Anthony PERARD
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-10-01 8:22 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-30 16:17 [XEN PATCH 0/2] Fixing gitlab CI tests Anthony PERARD
2021-09-30 16:17 ` [XEN PATCH 1/2] automation: switch GitLab x86 smoke test to use PV 64bit binary Anthony PERARD
2021-09-30 16:20 ` Andrew Cooper
2021-09-30 16:29 ` Anthony PERARD
2021-09-30 16:17 ` [XEN PATCH 2/2] automation: Add qemu to debian:stretch container for smoke test Anthony PERARD
2021-09-30 17:05 ` Andrew Cooper
2021-10-01 8:21 ` Anthony PERARD
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.