* [PATCH 1/6] automation: remove CR characters from QEMU serial
2023-11-16 12:13 [PATCH 0/6] automation: minor fixes and improvements Roger Pau Monne
@ 2023-11-16 12:13 ` Roger Pau Monne
2023-11-17 1:05 ` Stefano Stabellini
2023-11-16 12:13 ` [PATCH 2/6] automation: add timestamps to QEMU non-smoke x86-64 test Roger Pau Monne
` (4 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Roger Pau Monne @ 2023-11-16 12:13 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monne, Doug Goldstein, Stefano Stabellini
The gitlab CI webpage seems to have issues displaying the \CR\CR\LF "\r\r\n"
sequence on the web interface used as line returns by the Linux kernel serial
output. This leads to the QEMU tests output looking like:
(XEN) Guest Loglevel: Nothing (Rate-limited: Errors and warnings)
(XEN) *** Serial input to DOM0 (type 'CTRL-a' three times to switch input)
(XEN) Freed 664kB init memory
mapping kernel into physical memory
about to get started...
qemu-system-x86_64: terminating on signal 15 from pid 52 (timeout)
This not helpful, so strip the CR characters from the output that goes to
stdout, leaving the output in the smoke.serial untouched.
Fixes: 3030a73bf849 ('automation: add a QEMU based x86_64 Dom0/DomU test')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
automation/scripts/qemu-alpine-x86_64.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh
index 8c8d0b0cd759..a1c41c030a47 100755
--- a/automation/scripts/qemu-alpine-x86_64.sh
+++ b/automation/scripts/qemu-alpine-x86_64.sh
@@ -84,7 +84,10 @@ qemu-system-x86_64 \
-monitor none -serial stdio \
-nographic \
-device virtio-net-pci,netdev=n0 \
- -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0 |& tee smoke.serial
+ -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0 |& \
+ # Remove carriage returns from the stdout output, as gitlab
+ # interface chokes on them
+ tee smoke.serial | sed 's/\r//'
set -e
(grep -q "Domain-0" smoke.serial && grep -q "BusyBox" smoke.serial) || exit 1
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 1/6] automation: remove CR characters from QEMU serial
2023-11-16 12:13 ` [PATCH 1/6] automation: remove CR characters from QEMU serial Roger Pau Monne
@ 2023-11-17 1:05 ` Stefano Stabellini
2023-11-17 1:07 ` Stefano Stabellini
2023-11-17 10:07 ` Roger Pau Monné
0 siblings, 2 replies; 18+ messages in thread
From: Stefano Stabellini @ 2023-11-17 1:05 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Doug Goldstein, Stefano Stabellini
[-- Attachment #1: Type: text/plain, Size: 2800 bytes --]
On Thu, 16 Nov 2023, Roger Pau Monne wrote:
> The gitlab CI webpage seems to have issues displaying the \CR\CR\LF "\r\r\n"
> sequence on the web interface used as line returns by the Linux kernel serial
> output. This leads to the QEMU tests output looking like:
>
> (XEN) Guest Loglevel: Nothing (Rate-limited: Errors and warnings)
> (XEN) *** Serial input to DOM0 (type 'CTRL-a' three times to switch input)
> (XEN) Freed 664kB init memory
> mapping kernel into physical memory
> about to get started...
> qemu-system-x86_64: terminating on signal 15 from pid 52 (timeout)
>
> This not helpful, so strip the CR characters from the output that goes to
> stdout, leaving the output in the smoke.serial untouched.
>
> Fixes: 3030a73bf849 ('automation: add a QEMU based x86_64 Dom0/DomU test')
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Thanks for the patch. Let me see if I understood correctly.
In the gitlab web UI everything after the last (XEN) log line
disappears, for instance:
https://gitlab.com/xen-project/xen/-/jobs/5556551478
(XEN) d1v0: vGICD: unhandled word write 0x000000ffffffff to ICACTIVER0
/ # qemu-system-aarch64: terminating on signal 15 from pid 145 (timeout)
While if I look at the full logs there are plenty of Linux kernel logs
after it:
https://cdn.artifacts.gitlab-static.net/ec/ad/ecad5145a0ec1eb179fd47d1590d5ec43d705e8af2f9a816607ac31891cb82b9/2023_11_16/5556551478/6032156805/job.log?response-content-type=text%2Fplain%3B%20charset%3Dutf-8&response-content-disposition=inline&Expires=1700183635&KeyName=gprd-artifacts-cdn&Signature=vT8CBwI2Th23OvRvQKvNPgHiT5Y=
And this patch aims at fixing that, is that correct?
But I went to check your pipeline
https://gitlab.com/xen-project/people/royger/xen/-/pipelines/1074512137
and the corresponding job
https://gitlab.com/xen-project/people/royger/xen/-/jobs/5549620441 has
the same issue?
> ---
> automation/scripts/qemu-alpine-x86_64.sh | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh
> index 8c8d0b0cd759..a1c41c030a47 100755
> --- a/automation/scripts/qemu-alpine-x86_64.sh
> +++ b/automation/scripts/qemu-alpine-x86_64.sh
> @@ -84,7 +84,10 @@ qemu-system-x86_64 \
> -monitor none -serial stdio \
> -nographic \
> -device virtio-net-pci,netdev=n0 \
> - -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0 |& tee smoke.serial
> + -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0 |& \
> + # Remove carriage returns from the stdout output, as gitlab
> + # interface chokes on them
> + tee smoke.serial | sed 's/\r//'
>
> set -e
> (grep -q "Domain-0" smoke.serial && grep -q "BusyBox" smoke.serial) || exit 1
> --
> 2.42.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 1/6] automation: remove CR characters from QEMU serial
2023-11-17 1:05 ` Stefano Stabellini
@ 2023-11-17 1:07 ` Stefano Stabellini
2023-11-17 10:07 ` Roger Pau Monné
1 sibling, 0 replies; 18+ messages in thread
From: Stefano Stabellini @ 2023-11-17 1:07 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: Roger Pau Monne, xen-devel, Doug Goldstein
[-- Attachment #1: Type: text/plain, Size: 3193 bytes --]
On Thu, 16 Nov 2023, Stefano Stabellini wrote:
> On Thu, 16 Nov 2023, Roger Pau Monne wrote:
> > The gitlab CI webpage seems to have issues displaying the \CR\CR\LF "\r\r\n"
> > sequence on the web interface used as line returns by the Linux kernel serial
> > output. This leads to the QEMU tests output looking like:
> >
> > (XEN) Guest Loglevel: Nothing (Rate-limited: Errors and warnings)
> > (XEN) *** Serial input to DOM0 (type 'CTRL-a' three times to switch input)
> > (XEN) Freed 664kB init memory
> > mapping kernel into physical memory
> > about to get started...
> > qemu-system-x86_64: terminating on signal 15 from pid 52 (timeout)
> >
> > This not helpful, so strip the CR characters from the output that goes to
> > stdout, leaving the output in the smoke.serial untouched.
> >
> > Fixes: 3030a73bf849 ('automation: add a QEMU based x86_64 Dom0/DomU test')
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
>
> Thanks for the patch. Let me see if I understood correctly.
>
> In the gitlab web UI everything after the last (XEN) log line
> disappears, for instance:
>
> https://gitlab.com/xen-project/xen/-/jobs/5556551478
>
> (XEN) d1v0: vGICD: unhandled word write 0x000000ffffffff to ICACTIVER0
> / # qemu-system-aarch64: terminating on signal 15 from pid 145 (timeout)
>
>
> While if I look at the full logs there are plenty of Linux kernel logs
> after it:
> https://cdn.artifacts.gitlab-static.net/ec/ad/ecad5145a0ec1eb179fd47d1590d5ec43d705e8af2f9a816607ac31891cb82b9/2023_11_16/5556551478/6032156805/job.log?response-content-type=text%2Fplain%3B%20charset%3Dutf-8&response-content-disposition=inline&Expires=1700183635&KeyName=gprd-artifacts-cdn&Signature=vT8CBwI2Th23OvRvQKvNPgHiT5Y=
>
> And this patch aims at fixing that, is that correct?
>
>
> But I went to check your pipeline
> https://gitlab.com/xen-project/people/royger/xen/-/pipelines/1074512137
> and the corresponding job
> https://gitlab.com/xen-project/people/royger/xen/-/jobs/5549620441 has
> the same issue?
I take it back: you only fixed qemu-alpine-x86_64.sh and not the other.
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Can you please add a quick patch to do the same for all the other qemu-*
scripts?
> > ---
> > automation/scripts/qemu-alpine-x86_64.sh | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh
> > index 8c8d0b0cd759..a1c41c030a47 100755
> > --- a/automation/scripts/qemu-alpine-x86_64.sh
> > +++ b/automation/scripts/qemu-alpine-x86_64.sh
> > @@ -84,7 +84,10 @@ qemu-system-x86_64 \
> > -monitor none -serial stdio \
> > -nographic \
> > -device virtio-net-pci,netdev=n0 \
> > - -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0 |& tee smoke.serial
> > + -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0 |& \
> > + # Remove carriage returns from the stdout output, as gitlab
> > + # interface chokes on them
> > + tee smoke.serial | sed 's/\r//'
> >
> > set -e
> > (grep -q "Domain-0" smoke.serial && grep -q "BusyBox" smoke.serial) || exit 1
> > --
> > 2.42.0
> >
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 1/6] automation: remove CR characters from QEMU serial
2023-11-17 1:05 ` Stefano Stabellini
2023-11-17 1:07 ` Stefano Stabellini
@ 2023-11-17 10:07 ` Roger Pau Monné
2023-11-18 2:25 ` Stefano Stabellini
1 sibling, 1 reply; 18+ messages in thread
From: Roger Pau Monné @ 2023-11-17 10:07 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: xen-devel, Doug Goldstein
On Thu, Nov 16, 2023 at 05:05:28PM -0800, Stefano Stabellini wrote:
> On Thu, 16 Nov 2023, Roger Pau Monne wrote:
> > The gitlab CI webpage seems to have issues displaying the \CR\CR\LF "\r\r\n"
> > sequence on the web interface used as line returns by the Linux kernel serial
> > output. This leads to the QEMU tests output looking like:
> >
> > (XEN) Guest Loglevel: Nothing (Rate-limited: Errors and warnings)
> > (XEN) *** Serial input to DOM0 (type 'CTRL-a' three times to switch input)
> > (XEN) Freed 664kB init memory
> > mapping kernel into physical memory
> > about to get started...
> > qemu-system-x86_64: terminating on signal 15 from pid 52 (timeout)
> >
> > This not helpful, so strip the CR characters from the output that goes to
> > stdout, leaving the output in the smoke.serial untouched.
> >
> > Fixes: 3030a73bf849 ('automation: add a QEMU based x86_64 Dom0/DomU test')
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
>
> Thanks for the patch. Let me see if I understood correctly.
>
> In the gitlab web UI everything after the last (XEN) log line
> disappears, for instance:
>
> https://gitlab.com/xen-project/xen/-/jobs/5556551478
>
> (XEN) d1v0: vGICD: unhandled word write 0x000000ffffffff to ICACTIVER0
> / # qemu-system-aarch64: terminating on signal 15 from pid 145 (timeout)
>
>
> While if I look at the full logs there are plenty of Linux kernel logs
> after it:
> https://cdn.artifacts.gitlab-static.net/ec/ad/ecad5145a0ec1eb179fd47d1590d5ec43d705e8af2f9a816607ac31891cb82b9/2023_11_16/5556551478/6032156805/job.log?response-content-type=text%2Fplain%3B%20charset%3Dutf-8&response-content-disposition=inline&Expires=1700183635&KeyName=gprd-artifacts-cdn&Signature=vT8CBwI2Th23OvRvQKvNPgHiT5Y=
>
> And this patch aims at fixing that, is that correct?
>
>
> But I went to check your pipeline
> https://gitlab.com/xen-project/people/royger/xen/-/pipelines/1074512137
> and the corresponding job
> https://gitlab.com/xen-project/people/royger/xen/-/jobs/5549620441 has
> the same issue?
I made the change just for qemu-alpine-x86_64-gcc:
https://gitlab.com/xen-project/people/royger/xen/-/jobs/5550049674
I didn't realize qemu-smoke-dom0-arm64-gcc was also using it. If the
fix is acceptable I can submit v2 adding the arm instances also.
Thanks, Roger.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 1/6] automation: remove CR characters from QEMU serial
2023-11-17 10:07 ` Roger Pau Monné
@ 2023-11-18 2:25 ` Stefano Stabellini
0 siblings, 0 replies; 18+ messages in thread
From: Stefano Stabellini @ 2023-11-18 2:25 UTC (permalink / raw)
To: Roger Pau Monné; +Cc: Stefano Stabellini, xen-devel, Doug Goldstein
[-- Attachment #1: Type: text/plain, Size: 2681 bytes --]
On Fri, 17 Nov 2023, Roger Pau Monné wrote:
> On Thu, Nov 16, 2023 at 05:05:28PM -0800, Stefano Stabellini wrote:
> > On Thu, 16 Nov 2023, Roger Pau Monne wrote:
> > > The gitlab CI webpage seems to have issues displaying the \CR\CR\LF "\r\r\n"
> > > sequence on the web interface used as line returns by the Linux kernel serial
> > > output. This leads to the QEMU tests output looking like:
> > >
> > > (XEN) Guest Loglevel: Nothing (Rate-limited: Errors and warnings)
> > > (XEN) *** Serial input to DOM0 (type 'CTRL-a' three times to switch input)
> > > (XEN) Freed 664kB init memory
> > > mapping kernel into physical memory
> > > about to get started...
> > > qemu-system-x86_64: terminating on signal 15 from pid 52 (timeout)
> > >
> > > This not helpful, so strip the CR characters from the output that goes to
> > > stdout, leaving the output in the smoke.serial untouched.
> > >
> > > Fixes: 3030a73bf849 ('automation: add a QEMU based x86_64 Dom0/DomU test')
> > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> >
> > Thanks for the patch. Let me see if I understood correctly.
> >
> > In the gitlab web UI everything after the last (XEN) log line
> > disappears, for instance:
> >
> > https://gitlab.com/xen-project/xen/-/jobs/5556551478
> >
> > (XEN) d1v0: vGICD: unhandled word write 0x000000ffffffff to ICACTIVER0
> > / # qemu-system-aarch64: terminating on signal 15 from pid 145 (timeout)
> >
> >
> > While if I look at the full logs there are plenty of Linux kernel logs
> > after it:
> > https://cdn.artifacts.gitlab-static.net/ec/ad/ecad5145a0ec1eb179fd47d1590d5ec43d705e8af2f9a816607ac31891cb82b9/2023_11_16/5556551478/6032156805/job.log?response-content-type=text%2Fplain%3B%20charset%3Dutf-8&response-content-disposition=inline&Expires=1700183635&KeyName=gprd-artifacts-cdn&Signature=vT8CBwI2Th23OvRvQKvNPgHiT5Y=
> >
> > And this patch aims at fixing that, is that correct?
> >
> >
> > But I went to check your pipeline
> > https://gitlab.com/xen-project/people/royger/xen/-/pipelines/1074512137
> > and the corresponding job
> > https://gitlab.com/xen-project/people/royger/xen/-/jobs/5549620441 has
> > the same issue?
>
> I made the change just for qemu-alpine-x86_64-gcc:
>
> https://gitlab.com/xen-project/people/royger/xen/-/jobs/5550049674
>
> I didn't realize qemu-smoke-dom0-arm64-gcc was also using it. If the
> fix is acceptable I can submit v2 adding the arm instances also.
Yes the fix is fine. All the qemu scripts are copy/paste design right
now and I am aware they need to be unified. It is not just
qemu-smoke-dom0-arm64-gcc, also qemu-smoke-dom0less-arm64.sh and
basically all the other scripts that start QEMU.
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/6] automation: add timestamps to QEMU non-smoke x86-64 test
2023-11-16 12:13 [PATCH 0/6] automation: minor fixes and improvements Roger Pau Monne
2023-11-16 12:13 ` [PATCH 1/6] automation: remove CR characters from QEMU serial Roger Pau Monne
@ 2023-11-16 12:13 ` Roger Pau Monne
2023-11-17 1:07 ` Stefano Stabellini
2023-11-16 12:13 ` [PATCH 3/6] automation: fix jessie/stretch images to use archive.debian.org apt repos Roger Pau Monne
` (3 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Roger Pau Monne @ 2023-11-16 12:13 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monne, Doug Goldstein, Stefano Stabellini
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
automation/scripts/qemu-alpine-x86_64.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh
index a1c41c030a47..8e398dcea34b 100755
--- a/automation/scripts/qemu-alpine-x86_64.sh
+++ b/automation/scripts/qemu-alpine-x86_64.sh
@@ -68,7 +68,7 @@ cd ../..
cat >> binaries/pxelinux.0 << EOF
#!ipxe
-kernel xen console=com1
+kernel xen console=com1 console_timestamps=boot
module bzImage console=hvc0
module xen-rootfs.cpio.gz
boot
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 2/6] automation: add timestamps to QEMU non-smoke x86-64 test
2023-11-16 12:13 ` [PATCH 2/6] automation: add timestamps to QEMU non-smoke x86-64 test Roger Pau Monne
@ 2023-11-17 1:07 ` Stefano Stabellini
0 siblings, 0 replies; 18+ messages in thread
From: Stefano Stabellini @ 2023-11-17 1:07 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Doug Goldstein, Stefano Stabellini
[-- Attachment #1: Type: text/plain, Size: 807 bytes --]
On Thu, 16 Nov 2023, Roger Pau Monne wrote:
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Same here please apply to the other qemu-* scripts too
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> automation/scripts/qemu-alpine-x86_64.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh
> index a1c41c030a47..8e398dcea34b 100755
> --- a/automation/scripts/qemu-alpine-x86_64.sh
> +++ b/automation/scripts/qemu-alpine-x86_64.sh
> @@ -68,7 +68,7 @@ cd ../..
> cat >> binaries/pxelinux.0 << EOF
> #!ipxe
>
> -kernel xen console=com1
> +kernel xen console=com1 console_timestamps=boot
> module bzImage console=hvc0
> module xen-rootfs.cpio.gz
> boot
> --
> 2.42.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 3/6] automation: fix jessie/stretch images to use archive.debian.org apt repos
2023-11-16 12:13 [PATCH 0/6] automation: minor fixes and improvements Roger Pau Monne
2023-11-16 12:13 ` [PATCH 1/6] automation: remove CR characters from QEMU serial Roger Pau Monne
2023-11-16 12:13 ` [PATCH 2/6] automation: add timestamps to QEMU non-smoke x86-64 test Roger Pau Monne
@ 2023-11-16 12:13 ` Roger Pau Monne
2023-11-17 1:15 ` Stefano Stabellini
2023-11-16 12:13 ` [PATCH 4/6] automation: update tests to use Debian Bookworm Roger Pau Monne
` (2 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Roger Pau Monne @ 2023-11-16 12:13 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monne, Doug Goldstein, Stefano Stabellini
Otherwise it's impossible to build the images.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
automation/build/debian/jessie-i386.dockerfile | 7 +++++++
automation/build/debian/jessie.dockerfile | 7 +++++++
automation/build/debian/stretch-i386.dockerfile | 7 +++++++
automation/build/debian/stretch.dockerfile | 7 +++++++
4 files changed, 28 insertions(+)
diff --git a/automation/build/debian/jessie-i386.dockerfile b/automation/build/debian/jessie-i386.dockerfile
index c9ac15a3ffd6..a8dec82bb299 100644
--- a/automation/build/debian/jessie-i386.dockerfile
+++ b/automation/build/debian/jessie-i386.dockerfile
@@ -10,6 +10,13 @@ WORKDIR /build
ENTRYPOINT ["linux32"]
+# replace repos in archive as release is EOL
+RUN cat <<"END" > /etc/apt/sources.list
+deb http://archive.debian.org/debian/ jessie main contrib non-free
+deb http://archive.debian.org/debian/ jessie-backports main contrib non-free
+deb http://archive.debian.org/debian-security/ jessie/updates main contrib non-free
+END
+
# build depends
RUN apt-get update && \
apt-get --quiet --yes install \
diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile
index 63b2c1e5b771..5c71c3e3ea75 100644
--- a/automation/build/debian/jessie.dockerfile
+++ b/automation/build/debian/jessie.dockerfile
@@ -8,6 +8,13 @@ ENV USER root
RUN mkdir /build
WORKDIR /build
+# replace repos in archive as release is EOL
+RUN cat <<"END" > /etc/apt/sources.list
+deb http://archive.debian.org/debian/ jessie main contrib non-free
+deb http://archive.debian.org/debian/ jessie-backports main contrib non-free
+deb http://archive.debian.org/debian-security/ jessie/updates main contrib non-free
+END
+
# build depends
RUN apt-get update && \
apt-get --quiet --yes install \
diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile
index d93f74c979ef..9739651e25dd 100644
--- a/automation/build/debian/stretch-i386.dockerfile
+++ b/automation/build/debian/stretch-i386.dockerfile
@@ -10,6 +10,13 @@ WORKDIR /build
ENTRYPOINT ["linux32"]
+# replace repos in archive as release is EOL
+RUN cat <<"END" > /etc/apt/sources.list
+deb http://archive.debian.org/debian/ stretch main contrib non-free
+deb http://archive.debian.org/debian/ stretch-backports main contrib non-free
+deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free
+END
+
# build depends
RUN apt-get update && \
apt-get --quiet --yes install \
diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
index 1af6c691f8f4..2f1a99f45017 100644
--- a/automation/build/debian/stretch.dockerfile
+++ b/automation/build/debian/stretch.dockerfile
@@ -8,6 +8,13 @@ ENV USER root
RUN mkdir /build
WORKDIR /build
+# replace repos in archive as release is EOL
+RUN cat <<"END" > /etc/apt/sources.list
+deb http://archive.debian.org/debian/ stretch main contrib non-free
+deb http://archive.debian.org/debian/ stretch-backports main contrib non-free
+deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free
+END
+
# build depends
RUN apt-get update && \
apt-get --quiet --yes install \
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 3/6] automation: fix jessie/stretch images to use archive.debian.org apt repos
2023-11-16 12:13 ` [PATCH 3/6] automation: fix jessie/stretch images to use archive.debian.org apt repos Roger Pau Monne
@ 2023-11-17 1:15 ` Stefano Stabellini
0 siblings, 0 replies; 18+ messages in thread
From: Stefano Stabellini @ 2023-11-17 1:15 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Doug Goldstein, Stefano Stabellini
[-- Attachment #1: Type: text/plain, Size: 3540 bytes --]
On Thu, 16 Nov 2023, Roger Pau Monne wrote:
> Otherwise it's impossible to build the images.
>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> automation/build/debian/jessie-i386.dockerfile | 7 +++++++
> automation/build/debian/jessie.dockerfile | 7 +++++++
> automation/build/debian/stretch-i386.dockerfile | 7 +++++++
> automation/build/debian/stretch.dockerfile | 7 +++++++
> 4 files changed, 28 insertions(+)
>
> diff --git a/automation/build/debian/jessie-i386.dockerfile b/automation/build/debian/jessie-i386.dockerfile
> index c9ac15a3ffd6..a8dec82bb299 100644
> --- a/automation/build/debian/jessie-i386.dockerfile
> +++ b/automation/build/debian/jessie-i386.dockerfile
> @@ -10,6 +10,13 @@ WORKDIR /build
>
> ENTRYPOINT ["linux32"]
>
> +# replace repos in archive as release is EOL
> +RUN cat <<"END" > /etc/apt/sources.list
> +deb http://archive.debian.org/debian/ jessie main contrib non-free
> +deb http://archive.debian.org/debian/ jessie-backports main contrib non-free
> +deb http://archive.debian.org/debian-security/ jessie/updates main contrib non-free
> +END
> +
> # build depends
> RUN apt-get update && \
> apt-get --quiet --yes install \
> diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile
> index 63b2c1e5b771..5c71c3e3ea75 100644
> --- a/automation/build/debian/jessie.dockerfile
> +++ b/automation/build/debian/jessie.dockerfile
> @@ -8,6 +8,13 @@ ENV USER root
> RUN mkdir /build
> WORKDIR /build
>
> +# replace repos in archive as release is EOL
> +RUN cat <<"END" > /etc/apt/sources.list
> +deb http://archive.debian.org/debian/ jessie main contrib non-free
> +deb http://archive.debian.org/debian/ jessie-backports main contrib non-free
> +deb http://archive.debian.org/debian-security/ jessie/updates main contrib non-free
> +END
> +
> # build depends
> RUN apt-get update && \
> apt-get --quiet --yes install \
> diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile
> index d93f74c979ef..9739651e25dd 100644
> --- a/automation/build/debian/stretch-i386.dockerfile
> +++ b/automation/build/debian/stretch-i386.dockerfile
> @@ -10,6 +10,13 @@ WORKDIR /build
>
> ENTRYPOINT ["linux32"]
>
> +# replace repos in archive as release is EOL
> +RUN cat <<"END" > /etc/apt/sources.list
> +deb http://archive.debian.org/debian/ stretch main contrib non-free
> +deb http://archive.debian.org/debian/ stretch-backports main contrib non-free
> +deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free
> +END
> +
> # build depends
> RUN apt-get update && \
> apt-get --quiet --yes install \
> diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
> index 1af6c691f8f4..2f1a99f45017 100644
> --- a/automation/build/debian/stretch.dockerfile
> +++ b/automation/build/debian/stretch.dockerfile
> @@ -8,6 +8,13 @@ ENV USER root
> RUN mkdir /build
> WORKDIR /build
>
> +# replace repos in archive as release is EOL
> +RUN cat <<"END" > /etc/apt/sources.list
> +deb http://archive.debian.org/debian/ stretch main contrib non-free
> +deb http://archive.debian.org/debian/ stretch-backports main contrib non-free
> +deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free
> +END
> +
> # build depends
> RUN apt-get update && \
> apt-get --quiet --yes install \
> --
> 2.42.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 4/6] automation: update tests to use Debian Bookworm
2023-11-16 12:13 [PATCH 0/6] automation: minor fixes and improvements Roger Pau Monne
` (2 preceding siblings ...)
2023-11-16 12:13 ` [PATCH 3/6] automation: fix jessie/stretch images to use archive.debian.org apt repos Roger Pau Monne
@ 2023-11-16 12:13 ` Roger Pau Monne
2023-11-17 1:09 ` Stefano Stabellini
2023-11-16 12:13 ` [PATCH 5/6] automation: set architecture in docker files Roger Pau Monne
2023-11-16 12:13 ` [PATCH 6/6] automation: switch to multi-platform images when possible Roger Pau Monne
5 siblings, 1 reply; 18+ messages in thread
From: Roger Pau Monne @ 2023-11-16 12:13 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monne, Doug Goldstein, Stefano Stabellini
Switch tests using Stretch to Bookworm, as Stretch is EOL.
Note the packages are not removed from the Stretch dockerfile, because the
tests in stable branches will run using the old containers.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
The Bookworm container needs to be updated to contain the required tools before
pushing this change.
---
automation/build/debian/bookworm.dockerfile | 5 +++++
automation/gitlab-ci/test.yaml | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile
index ae008c8d46e5..7aea081c13a9 100644
--- a/automation/build/debian/bookworm.dockerfile
+++ b/automation/build/debian/bookworm.dockerfile
@@ -46,6 +46,11 @@ RUN apt-get update && \
gnupg \
apt-transport-https \
golang \
+ # for test phase, qemu-smoke-* jobs
+ qemu-system-x86 \
+ # for test phase, qemu-alpine-* jobs
+ cpio \
+ busybox-static \
&& \
apt-get autoremove -y && \
apt-get clean && \
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 61e642cce0cc..6aabdb9d156f 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -43,7 +43,7 @@
.qemu-x86-64:
extends: .test-jobs-common
variables:
- CONTAINER: debian:stretch
+ CONTAINER: debian:bookworm
LOGFILE: qemu-smoke-x86-64.log
artifacts:
paths:
@@ -130,7 +130,7 @@
build-each-commit-gcc:
extends: .test-jobs-common
variables:
- CONTAINER: debian:stretch
+ CONTAINER: debian:bookworm
XEN_TARGET_ARCH: x86_64
CC: gcc
script:
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 4/6] automation: update tests to use Debian Bookworm
2023-11-16 12:13 ` [PATCH 4/6] automation: update tests to use Debian Bookworm Roger Pau Monne
@ 2023-11-17 1:09 ` Stefano Stabellini
0 siblings, 0 replies; 18+ messages in thread
From: Stefano Stabellini @ 2023-11-17 1:09 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Doug Goldstein, Stefano Stabellini
[-- Attachment #1: Type: text/plain, Size: 1996 bytes --]
On Thu, 16 Nov 2023, Roger Pau Monne wrote:
> Switch tests using Stretch to Bookworm, as Stretch is EOL.
>
> Note the packages are not removed from the Stretch dockerfile, because the
> tests in stable branches will run using the old containers.
>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> The Bookworm container needs to be updated to contain the required tools before
> pushing this change.
I'll do that after the release just to stay on the safe side
> ---
> automation/build/debian/bookworm.dockerfile | 5 +++++
> automation/gitlab-ci/test.yaml | 4 ++--
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile
> index ae008c8d46e5..7aea081c13a9 100644
> --- a/automation/build/debian/bookworm.dockerfile
> +++ b/automation/build/debian/bookworm.dockerfile
> @@ -46,6 +46,11 @@ RUN apt-get update && \
> gnupg \
> apt-transport-https \
> golang \
> + # for test phase, qemu-smoke-* jobs
> + qemu-system-x86 \
> + # for test phase, qemu-alpine-* jobs
> + cpio \
> + busybox-static \
> && \
> apt-get autoremove -y && \
> apt-get clean && \
> diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
> index 61e642cce0cc..6aabdb9d156f 100644
> --- a/automation/gitlab-ci/test.yaml
> +++ b/automation/gitlab-ci/test.yaml
> @@ -43,7 +43,7 @@
> .qemu-x86-64:
> extends: .test-jobs-common
> variables:
> - CONTAINER: debian:stretch
> + CONTAINER: debian:bookworm
> LOGFILE: qemu-smoke-x86-64.log
> artifacts:
> paths:
> @@ -130,7 +130,7 @@
> build-each-commit-gcc:
> extends: .test-jobs-common
> variables:
> - CONTAINER: debian:stretch
> + CONTAINER: debian:bookworm
> XEN_TARGET_ARCH: x86_64
> CC: gcc
> script:
> --
> 2.42.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 5/6] automation: set architecture in docker files
2023-11-16 12:13 [PATCH 0/6] automation: minor fixes and improvements Roger Pau Monne
` (3 preceding siblings ...)
2023-11-16 12:13 ` [PATCH 4/6] automation: update tests to use Debian Bookworm Roger Pau Monne
@ 2023-11-16 12:13 ` Roger Pau Monne
2023-11-16 12:13 ` [PATCH 6/6] automation: switch to multi-platform images when possible Roger Pau Monne
5 siblings, 0 replies; 18+ messages in thread
From: Roger Pau Monne @ 2023-11-16 12:13 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monne, Doug Goldstein, Stefano Stabellini
Pass the desired architecture of the image in the FROM instruction if the
image is possibly multi-platform.
This allows using the x86 Dockerfiles on OS X on arm64 hardware.
No functional change intended.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
I haven't touched the Yocto dockerfile because I'm not sure how it's used.
---
automation/build/alpine/3.18.dockerfile | 2 +-
automation/build/archlinux/current-riscv64.dockerfile | 2 +-
automation/build/archlinux/current.dockerfile | 2 +-
automation/build/centos/7.dockerfile | 2 +-
automation/build/debian/bookworm.dockerfile | 2 +-
automation/build/debian/bullseye-ppc64le.dockerfile | 2 +-
automation/build/debian/buster-gcc-ibt.dockerfile | 2 +-
automation/build/debian/jessie.dockerfile | 2 +-
automation/build/debian/stretch.dockerfile | 2 +-
automation/build/fedora/29.dockerfile | 2 +-
automation/build/suse/opensuse-leap.dockerfile | 2 +-
automation/build/suse/opensuse-tumbleweed.dockerfile | 2 +-
automation/build/ubuntu/bionic.dockerfile | 2 +-
automation/build/ubuntu/focal.dockerfile | 2 +-
automation/build/ubuntu/trusty.dockerfile | 2 +-
automation/build/ubuntu/xenial-xilinx.dockerfile | 2 +-
automation/build/ubuntu/xenial.dockerfile | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/automation/build/alpine/3.18.dockerfile b/automation/build/alpine/3.18.dockerfile
index 5d2a69a06010..4ae9cb5e9e30 100644
--- a/automation/build/alpine/3.18.dockerfile
+++ b/automation/build/alpine/3.18.dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM --platform=linux/amd64 alpine:3.18
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/archlinux/current-riscv64.dockerfile b/automation/build/archlinux/current-riscv64.dockerfile
index abf8e7bf0b88..af75b5c720ce 100644
--- a/automation/build/archlinux/current-riscv64.dockerfile
+++ b/automation/build/archlinux/current-riscv64.dockerfile
@@ -1,4 +1,4 @@
-FROM archlinux
+FROM --platform=linux/amd64 archlinux
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile
index 47e79637a4a6..d974a1434fd5 100644
--- a/automation/build/archlinux/current.dockerfile
+++ b/automation/build/archlinux/current.dockerfile
@@ -1,4 +1,4 @@
-FROM archlinux:base-devel
+FROM --platform=linux/amd64 archlinux:base-devel
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/centos/7.dockerfile b/automation/build/centos/7.dockerfile
index 69dcefb2f011..ab450f0b3a0e 100644
--- a/automation/build/centos/7.dockerfile
+++ b/automation/build/centos/7.dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7
+FROM --platform=linux/amd64 centos:7
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile
index 7aea081c13a9..459f8e30bdc6 100644
--- a/automation/build/debian/bookworm.dockerfile
+++ b/automation/build/debian/bookworm.dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm
+FROM --platform=linux/amd64 debian:bookworm
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/debian/bullseye-ppc64le.dockerfile b/automation/build/debian/bullseye-ppc64le.dockerfile
index 4de8458445ae..6fdfb6bc2b40 100644
--- a/automation/build/debian/bullseye-ppc64le.dockerfile
+++ b/automation/build/debian/bullseye-ppc64le.dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM --platform=linux/amd64 debian:bullseye-slim
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/debian/buster-gcc-ibt.dockerfile b/automation/build/debian/buster-gcc-ibt.dockerfile
index 96ab4fe8a2f1..4328c109b72b 100644
--- a/automation/build/debian/buster-gcc-ibt.dockerfile
+++ b/automation/build/debian/buster-gcc-ibt.dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim AS builder
+FROM --platform=linux/amd64 debian:buster-slim AS builder
ENV DEBIAN_FRONTEND=noninteractive
ENV USER root
diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile
index 5c71c3e3ea75..32fc952fbc2d 100644
--- a/automation/build/debian/jessie.dockerfile
+++ b/automation/build/debian/jessie.dockerfile
@@ -1,4 +1,4 @@
-FROM debian/eol:jessie
+FROM --platform=linux/amd64 debian/eol:jessie
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
index 2f1a99f45017..e2706a8f3589 100644
--- a/automation/build/debian/stretch.dockerfile
+++ b/automation/build/debian/stretch.dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM --platform=linux/amd64 debian:stretch
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile
index e55b06a4517e..42a87ce6c84b 100644
--- a/automation/build/fedora/29.dockerfile
+++ b/automation/build/fedora/29.dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:29
+FROM --platform=linux/amd64 fedora:29
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile
index 7010b71acaa0..e1ec38a41445 100644
--- a/automation/build/suse/opensuse-leap.dockerfile
+++ b/automation/build/suse/opensuse-leap.dockerfile
@@ -1,4 +1,4 @@
-FROM opensuse/leap
+FROM --platform=linux/amd64 opensuse/leap
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile
index 959e1f6939f0..38f6fda2ff1b 100644
--- a/automation/build/suse/opensuse-tumbleweed.dockerfile
+++ b/automation/build/suse/opensuse-tumbleweed.dockerfile
@@ -1,4 +1,4 @@
-FROM opensuse/tumbleweed
+FROM --platform=linux/amd64 opensuse/tumbleweed
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/ubuntu/bionic.dockerfile b/automation/build/ubuntu/bionic.dockerfile
index e15f54431efb..77d7f933860c 100644
--- a/automation/build/ubuntu/bionic.dockerfile
+++ b/automation/build/ubuntu/bionic.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM --platform=linux/amd64 ubuntu:18.04
LABEL maintainer.name="The Xen Project " \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile
index e3d11194ee2f..30a9b8e84ffe 100644
--- a/automation/build/ubuntu/focal.dockerfile
+++ b/automation/build/ubuntu/focal.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM --platform=linux/amd64 ubuntu:20.04
LABEL maintainer.name="The Xen Project " \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/ubuntu/trusty.dockerfile b/automation/build/ubuntu/trusty.dockerfile
index 22e294c20cac..0d33578c4e1d 100644
--- a/automation/build/ubuntu/trusty.dockerfile
+++ b/automation/build/ubuntu/trusty.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM --platform=linux/amd64 ubuntu:14.04
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/ubuntu/xenial-xilinx.dockerfile b/automation/build/ubuntu/xenial-xilinx.dockerfile
index 5f7087135213..49f27b322995 100644
--- a/automation/build/ubuntu/xenial-xilinx.dockerfile
+++ b/automation/build/ubuntu/xenial-xilinx.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM --platform=linux/amd64 ubuntu:16.04
LABEL maintainer.name="The Xen Project " \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/ubuntu/xenial.dockerfile b/automation/build/ubuntu/xenial.dockerfile
index 2d2ba3e31f63..e8035434f804 100644
--- a/automation/build/ubuntu/xenial.dockerfile
+++ b/automation/build/ubuntu/xenial.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM --platform=linux/amd64 ubuntu:16.04
LABEL maintainer.name="The Xen Project " \
maintainer.email="xen-devel@lists.xenproject.org"
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 6/6] automation: switch to multi-platform images when possible
2023-11-16 12:13 [PATCH 0/6] automation: minor fixes and improvements Roger Pau Monne
` (4 preceding siblings ...)
2023-11-16 12:13 ` [PATCH 5/6] automation: set architecture in docker files Roger Pau Monne
@ 2023-11-16 12:13 ` Roger Pau Monne
2023-11-17 1:14 ` Stefano Stabellini
5 siblings, 1 reply; 18+ messages in thread
From: Roger Pau Monne @ 2023-11-16 12:13 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monne, Doug Goldstein, Stefano Stabellini
Instead of using specific architecture image, switch to using multi-arch ones
and specify the desired architecture using the --platform option.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
I haven't touched the Yocto dockerfile because I'm not sure how it's used.
---
automation/build/alpine/3.18-arm64v8.dockerfile | 2 +-
automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile | 2 +-
automation/build/debian/bookworm-arm64v8.dockerfile | 2 +-
automation/build/debian/bookworm-cppcheck.dockerfile | 2 +-
automation/build/debian/bookworm-i386.dockerfile | 2 +-
automation/build/debian/stretch-i386.dockerfile | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile
index 470f5d72a921..91e90220240f 100644
--- a/automation/build/alpine/3.18-arm64v8.dockerfile
+++ b/automation/build/alpine/3.18-arm64v8.dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:3.18
+FROM --platform=linux/arm64/v8 alpine:3.18
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
index b3295c435ed5..a05ffeac04f9 100644
--- a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
+++ b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:bookworm
+FROM --platform=linux/arm64/v8 debian:bookworm
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/debian/bookworm-arm64v8.dockerfile b/automation/build/debian/bookworm-arm64v8.dockerfile
index 640b1e0eadf2..2c432aacb765 100644
--- a/automation/build/debian/bookworm-arm64v8.dockerfile
+++ b/automation/build/debian/bookworm-arm64v8.dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:bookworm
+FROM --platform=linux/arm64/v8 debian:bookworm
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/debian/bookworm-cppcheck.dockerfile b/automation/build/debian/bookworm-cppcheck.dockerfile
index d64fb7b18c66..d368d69472cb 100644
--- a/automation/build/debian/bookworm-cppcheck.dockerfile
+++ b/automation/build/debian/bookworm-cppcheck.dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:bookworm AS builder
+FROM --platform=linux/arm64/v8 debian:bookworm AS builder
ENV DEBIAN_FRONTEND=noninteractive
ENV CPPCHECK_VERSION=2.7
diff --git a/automation/build/debian/bookworm-i386.dockerfile b/automation/build/debian/bookworm-i386.dockerfile
index 559bf670f0f1..89a650338566 100644
--- a/automation/build/debian/bookworm-i386.dockerfile
+++ b/automation/build/debian/bookworm-i386.dockerfile
@@ -1,4 +1,4 @@
-FROM i386/debian:bookworm
+FROM --platform=linux/i386 debian:bookworm
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile
index 9739651e25dd..da93fed8ea68 100644
--- a/automation/build/debian/stretch-i386.dockerfile
+++ b/automation/build/debian/stretch-i386.dockerfile
@@ -1,4 +1,4 @@
-FROM i386/debian:stretch
+FROM --platform=linux/i386 debian:stretch
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 6/6] automation: switch to multi-platform images when possible
2023-11-16 12:13 ` [PATCH 6/6] automation: switch to multi-platform images when possible Roger Pau Monne
@ 2023-11-17 1:14 ` Stefano Stabellini
2023-11-17 10:15 ` Roger Pau Monné
0 siblings, 1 reply; 18+ messages in thread
From: Stefano Stabellini @ 2023-11-17 1:14 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Doug Goldstein, Stefano Stabellini
[-- Attachment #1: Type: text/plain, Size: 4021 bytes --]
On Thu, 16 Nov 2023, Roger Pau Monne wrote:
> Instead of using specific architecture image, switch to using multi-arch ones
> and specify the desired architecture using the --platform option.
>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> ---
> I haven't touched the Yocto dockerfile because I'm not sure how it's used.
We are missing:
automation/build/debian/buster-gcc-ibt.dockerfile
automation/build/debian/bookworm-cppcheck.dockerfile
automation/tests-artifacts/*
Aside from that, it is fine.
How did you test the updated containers? Have you already pushed them to
the registry?
> ---
> automation/build/alpine/3.18-arm64v8.dockerfile | 2 +-
> automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile | 2 +-
> automation/build/debian/bookworm-arm64v8.dockerfile | 2 +-
> automation/build/debian/bookworm-cppcheck.dockerfile | 2 +-
> automation/build/debian/bookworm-i386.dockerfile | 2 +-
> automation/build/debian/stretch-i386.dockerfile | 2 +-
> 6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile
> index 470f5d72a921..91e90220240f 100644
> --- a/automation/build/alpine/3.18-arm64v8.dockerfile
> +++ b/automation/build/alpine/3.18-arm64v8.dockerfile
> @@ -1,4 +1,4 @@
> -FROM arm64v8/alpine:3.18
> +FROM --platform=linux/arm64/v8 alpine:3.18
> LABEL maintainer.name="The Xen Project" \
> maintainer.email="xen-devel@lists.xenproject.org"
>
> diff --git a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
> index b3295c435ed5..a05ffeac04f9 100644
> --- a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
> +++ b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
> @@ -1,4 +1,4 @@
> -FROM arm64v8/debian:bookworm
> +FROM --platform=linux/arm64/v8 debian:bookworm
> LABEL maintainer.name="The Xen Project" \
> maintainer.email="xen-devel@lists.xenproject.org"
>
> diff --git a/automation/build/debian/bookworm-arm64v8.dockerfile b/automation/build/debian/bookworm-arm64v8.dockerfile
> index 640b1e0eadf2..2c432aacb765 100644
> --- a/automation/build/debian/bookworm-arm64v8.dockerfile
> +++ b/automation/build/debian/bookworm-arm64v8.dockerfile
> @@ -1,4 +1,4 @@
> -FROM arm64v8/debian:bookworm
> +FROM --platform=linux/arm64/v8 debian:bookworm
> LABEL maintainer.name="The Xen Project" \
> maintainer.email="xen-devel@lists.xenproject.org"
>
> diff --git a/automation/build/debian/bookworm-cppcheck.dockerfile b/automation/build/debian/bookworm-cppcheck.dockerfile
> index d64fb7b18c66..d368d69472cb 100644
> --- a/automation/build/debian/bookworm-cppcheck.dockerfile
> +++ b/automation/build/debian/bookworm-cppcheck.dockerfile
> @@ -1,4 +1,4 @@
> -FROM arm64v8/debian:bookworm AS builder
> +FROM --platform=linux/arm64/v8 debian:bookworm AS builder
>
> ENV DEBIAN_FRONTEND=noninteractive
> ENV CPPCHECK_VERSION=2.7
> diff --git a/automation/build/debian/bookworm-i386.dockerfile b/automation/build/debian/bookworm-i386.dockerfile
> index 559bf670f0f1..89a650338566 100644
> --- a/automation/build/debian/bookworm-i386.dockerfile
> +++ b/automation/build/debian/bookworm-i386.dockerfile
> @@ -1,4 +1,4 @@
> -FROM i386/debian:bookworm
> +FROM --platform=linux/i386 debian:bookworm
> LABEL maintainer.name="The Xen Project" \
> maintainer.email="xen-devel@lists.xenproject.org"
>
> diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile
> index 9739651e25dd..da93fed8ea68 100644
> --- a/automation/build/debian/stretch-i386.dockerfile
> +++ b/automation/build/debian/stretch-i386.dockerfile
> @@ -1,4 +1,4 @@
> -FROM i386/debian:stretch
> +FROM --platform=linux/i386 debian:stretch
> LABEL maintainer.name="The Xen Project" \
> maintainer.email="xen-devel@lists.xenproject.org"
>
> --
> 2.42.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/6] automation: switch to multi-platform images when possible
2023-11-17 1:14 ` Stefano Stabellini
@ 2023-11-17 10:15 ` Roger Pau Monné
2023-11-18 2:27 ` Stefano Stabellini
0 siblings, 1 reply; 18+ messages in thread
From: Roger Pau Monné @ 2023-11-17 10:15 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: xen-devel, Doug Goldstein
On Thu, Nov 16, 2023 at 05:14:23PM -0800, Stefano Stabellini wrote:
> On Thu, 16 Nov 2023, Roger Pau Monne wrote:
> > Instead of using specific architecture image, switch to using multi-arch ones
> > and specify the desired architecture using the --platform option.
> >
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> > ---
> > I haven't touched the Yocto dockerfile because I'm not sure how it's used.
>
> We are missing:
>
> automation/build/debian/buster-gcc-ibt.dockerfile
That file was updated in patch 5/6:
https://lore.kernel.org/xen-devel/20231116121310.72210-6-roger.pau@citrix.com/
> automation/build/debian/bookworm-cppcheck.dockerfile
Not sure I'm following, bookworm-cppcheck.dockerfile is updated...
> automation/tests-artifacts/*
Oh, didn't realize about those, I will do in a separate patch.
> Aside from that, it is fine.
>
> How did you test the updated containers? Have you already pushed them to
> the registry?
I've pushed them to my local registry and changed the registry in one
of my Xen branches, see:
https://gitlab.com/xen-project/people/royger/xen/-/pipelines/1074512137
Some jobs failed because the runners run out of space.
Thanks, Roger.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/6] automation: switch to multi-platform images when possible
2023-11-17 10:15 ` Roger Pau Monné
@ 2023-11-18 2:27 ` Stefano Stabellini
2023-11-20 11:19 ` Roger Pau Monné
0 siblings, 1 reply; 18+ messages in thread
From: Stefano Stabellini @ 2023-11-18 2:27 UTC (permalink / raw)
To: Roger Pau Monné; +Cc: Stefano Stabellini, xen-devel, Doug Goldstein
[-- Attachment #1: Type: text/plain, Size: 1612 bytes --]
On Fri, 17 Nov 2023, Roger Pau Monné wrote:
> On Thu, Nov 16, 2023 at 05:14:23PM -0800, Stefano Stabellini wrote:
> > On Thu, 16 Nov 2023, Roger Pau Monne wrote:
> > > Instead of using specific architecture image, switch to using multi-arch ones
> > > and specify the desired architecture using the --platform option.
> > >
> > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> > > ---
> > > I haven't touched the Yocto dockerfile because I'm not sure how it's used.
> >
> > We are missing:
> >
> > automation/build/debian/buster-gcc-ibt.dockerfile
>
> That file was updated in patch 5/6:
>
> https://lore.kernel.org/xen-devel/20231116121310.72210-6-roger.pau@citrix.com/
>
> > automation/build/debian/bookworm-cppcheck.dockerfile
>
> Not sure I'm following, bookworm-cppcheck.dockerfile is updated...
>
> > automation/tests-artifacts/*
>
> Oh, didn't realize about those, I will do in a separate patch.
Thanks!
> > Aside from that, it is fine.
> >
> > How did you test the updated containers? Have you already pushed them to
> > the registry?
>
> I've pushed them to my local registry and changed the registry in one
> of my Xen branches, see:
>
> https://gitlab.com/xen-project/people/royger/xen/-/pipelines/1074512137
>
> Some jobs failed because the runners run out of space.
Oh, OK. It is going to be a lot of work to rebuild and push all the
containers and I wouldn't mind you doing that once the patches are
acked. In fact it would be great if you pushed the containers once you
tests that they work as expected. If you don't have the right access
permissions, I can do that too
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/6] automation: switch to multi-platform images when possible
2023-11-18 2:27 ` Stefano Stabellini
@ 2023-11-20 11:19 ` Roger Pau Monné
0 siblings, 0 replies; 18+ messages in thread
From: Roger Pau Monné @ 2023-11-20 11:19 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: xen-devel, Doug Goldstein
On Fri, Nov 17, 2023 at 06:27:50PM -0800, Stefano Stabellini wrote:
> On Fri, 17 Nov 2023, Roger Pau Monné wrote:
> > On Thu, Nov 16, 2023 at 05:14:23PM -0800, Stefano Stabellini wrote:
> > > On Thu, 16 Nov 2023, Roger Pau Monne wrote:
> > > > Instead of using specific architecture image, switch to using multi-arch ones
> > > > and specify the desired architecture using the --platform option.
> > > >
> > > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> > > > ---
> > > > I haven't touched the Yocto dockerfile because I'm not sure how it's used.
> > >
> > > We are missing:
> > >
> > > automation/build/debian/buster-gcc-ibt.dockerfile
> >
> > That file was updated in patch 5/6:
> >
> > https://lore.kernel.org/xen-devel/20231116121310.72210-6-roger.pau@citrix.com/
> >
> > > automation/build/debian/bookworm-cppcheck.dockerfile
> >
> > Not sure I'm following, bookworm-cppcheck.dockerfile is updated...
> >
> > > automation/tests-artifacts/*
> >
> > Oh, didn't realize about those, I will do in a separate patch.
>
> Thanks!
>
>
> > > Aside from that, it is fine.
> > >
> > > How did you test the updated containers? Have you already pushed them to
> > > the registry?
> >
> > I've pushed them to my local registry and changed the registry in one
> > of my Xen branches, see:
> >
> > https://gitlab.com/xen-project/people/royger/xen/-/pipelines/1074512137
> >
> > Some jobs failed because the runners run out of space.
>
> Oh, OK. It is going to be a lot of work to rebuild and push all the
> containers and I wouldn't mind you doing that once the patches are
> acked. In fact it would be great if you pushed the containers once you
> tests that they work as expected. If you don't have the right access
> permissions, I can do that too
For the patches only the x86 bookworm container needs to be rebuild in
order to contain the packages required by the test step.
The rest can be updated either before or after the series has been
committed.
Thanks, Roger.
^ permalink raw reply [flat|nested] 18+ messages in thread