We don't support 32-bit Windows any more, so we don't need to defend it
with this CI job.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
.gitlab-ci.d/container-cross.yml | 5 -
.gitlab-ci.d/crossbuilds.yml | 14 ---
.../dockerfiles/fedora-win32-cross.docker | 111 ------------------
tests/lcitool/refresh | 5 -
4 files changed, 135 deletions(-)
delete mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index 8d235cbea01..e3103940a0e 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -101,11 +101,6 @@ cris-fedora-cross-container:
variables:
NAME: fedora-cris-cross
-win32-fedora-cross-container:
- extends: .container_job_template
- variables:
- NAME: fedora-win32-cross
-
win64-fedora-cross-container:
extends: .container_job_template
variables:
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index d19d98cde05..987ba9694ba 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -159,20 +159,6 @@ cross-mips64el-kvm-only:
IMAGE: debian-mips64el-cross
EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu
-cross-win32-system:
- extends: .cross_system_build_job
- needs:
- job: win32-fedora-cross-container
- variables:
- IMAGE: fedora-win32-cross
- EXTRA_CONFIGURE_OPTS: --enable-fdt=internal
- CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu
- microblazeel-softmmu mips64el-softmmu nios2-softmmu
- artifacts:
- when: on_success
- paths:
- - build/qemu-setup*.exe
-
cross-win64-system:
extends: .cross_system_build_job
needs:
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
deleted file mode 100644
index 08799219f98..00000000000
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ /dev/null
@@ -1,111 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --layers all --cross-arch mingw32 fedora-38 qemu
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.fedoraproject.org/fedora:38
-
-RUN dnf install -y nosync && \
- printf '#!/bin/sh\n\
-if test -d /usr/lib64\n\
-then\n\
- export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
-else\n\
- export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
-fi\n\
-exec "$@"\n' > /usr/bin/nosync && \
- chmod +x /usr/bin/nosync && \
- nosync dnf update -y && \
- nosync dnf install -y \
- bash \
- bc \
- bison \
- bzip2 \
- ca-certificates \
- ccache \
- ctags \
- dbus-daemon \
- diffutils \
- findutils \
- flex \
- gcc \
- gcovr \
- git \
- glib2-devel \
- glibc-langpack-en \
- hostname \
- llvm \
- make \
- meson \
- mtools \
- ninja-build \
- nmap-ncat \
- openssh-clients \
- pcre-static \
- python3 \
- python3-PyYAML \
- python3-numpy \
- python3-opencv \
- python3-pillow \
- python3-pip \
- python3-sphinx \
- python3-sphinx_rtd_theme \
- sed \
- socat \
- sparse \
- spice-protocol \
- swtpm \
- tar \
- tesseract \
- tesseract-langpack-eng \
- util-linux \
- which \
- xorriso \
- zstd && \
- nosync dnf autoremove -y && \
- nosync dnf clean all -y
-
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-
-RUN nosync dnf install -y \
- mingw32-SDL2 \
- mingw32-SDL2_image \
- mingw32-bzip2 \
- mingw32-curl \
- mingw32-gcc \
- mingw32-gcc-c++ \
- mingw32-gettext \
- mingw32-glib2 \
- mingw32-gnutls \
- mingw32-gtk3 \
- mingw32-libepoxy \
- mingw32-libgcrypt \
- mingw32-libjpeg-turbo \
- mingw32-libpng \
- mingw32-libtasn1 \
- mingw32-nettle \
- mingw32-nsis \
- mingw32-pixman \
- mingw32-pkg-config && \
- nosync dnf clean all -y && \
- rpm -qa | sort > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
-
-ENV ABI "i686-w64-mingw32"
-ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson"
-ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32-
-ENV DEF_TARGET_LIST i386-softmmu
-# As a final step configure the user (if env is defined)
-ARG USER
-ARG UID
-RUN if [ "${USER}" ]; then \
- id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 0c93557ad67..fe7692c5006 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -192,11 +192,6 @@ try:
trailer=cross_build("s390x-linux-gnu-",
"s390x-softmmu,s390x-linux-user"))
- generate_dockerfile("fedora-win32-cross", "fedora-38",
- cross="mingw32",
- trailer=cross_build("i686-w64-mingw32-",
- "i386-softmmu"))
-
generate_dockerfile("fedora-win64-cross", "fedora-38",
cross="mingw64",
trailer=cross_build("x86_64-w64-mingw32-",
--
2.34.1On 20/02/2024 18.44, Peter Maydell wrote: > We don't support 32-bit Windows any more, so we don't need to defend it > with this CI job. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > .gitlab-ci.d/container-cross.yml | 5 - > .gitlab-ci.d/crossbuilds.yml | 14 --- > .../dockerfiles/fedora-win32-cross.docker | 111 ------------------ > tests/lcitool/refresh | 5 - > 4 files changed, 135 deletions(-) > delete mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker Reviewed-by: Thomas Huth <thuth@redhat.com>
On 20/2/24 18:44, Peter Maydell wrote: > We don't support 32-bit Windows any more, so we don't need to defend it > with this CI job. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > .gitlab-ci.d/container-cross.yml | 5 - > .gitlab-ci.d/crossbuilds.yml | 14 --- > .../dockerfiles/fedora-win32-cross.docker | 111 ------------------ > tests/lcitool/refresh | 5 - > 4 files changed, 135 deletions(-) > delete mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker > diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml > index d19d98cde05..987ba9694ba 100644 > --- a/.gitlab-ci.d/crossbuilds.yml > +++ b/.gitlab-ci.d/crossbuilds.yml > @@ -159,20 +159,6 @@ cross-mips64el-kvm-only: > IMAGE: debian-mips64el-cross > EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu > > -cross-win32-system: > - extends: .cross_system_build_job > - needs: > - job: win32-fedora-cross-container > - variables: > - IMAGE: fedora-win32-cross > - EXTRA_CONFIGURE_OPTS: --enable-fdt=internal > - CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu > - microblazeel-softmmu mips64el-softmmu nios2-softmmu Thomas, is it possible to add mips64el-softmmu to the cross-win64-system job or is it already at the timeout limit? > - artifacts: > - when: on_success > - paths: > - - build/qemu-setup*.exe > - > cross-win64-system: > extends: .cross_system_build_job > needs:
On Tue, 20 Feb 2024 at 18:46, Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > > On 20/2/24 18:44, Peter Maydell wrote: > > We don't support 32-bit Windows any more, so we don't need to defend it > > with this CI job. > > > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > > --- > > .gitlab-ci.d/container-cross.yml | 5 - > > .gitlab-ci.d/crossbuilds.yml | 14 --- > > .../dockerfiles/fedora-win32-cross.docker | 111 ------------------ > > tests/lcitool/refresh | 5 - > > 4 files changed, 135 deletions(-) > > delete mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker > > > > diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml > > index d19d98cde05..987ba9694ba 100644 > > --- a/.gitlab-ci.d/crossbuilds.yml > > +++ b/.gitlab-ci.d/crossbuilds.yml > > @@ -159,20 +159,6 @@ cross-mips64el-kvm-only: > > IMAGE: debian-mips64el-cross > > EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu > > > > -cross-win32-system: > > - extends: .cross_system_build_job > > - needs: > > - job: win32-fedora-cross-container > > - variables: > > - IMAGE: fedora-win32-cross > > - EXTRA_CONFIGURE_OPTS: --enable-fdt=internal > > - CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu > > - microblazeel-softmmu mips64el-softmmu nios2-softmmu > > Thomas, is it possible to add mips64el-softmmu to the cross-win64-system > job or is it already at the timeout limit? This is a skip, i.e. exclude, list, not an include list. So dropping this job is not removing mips64el-softmmu from coverage. The Windows build coverage we lose will be the targets we are skipping in the cross-win64-system job and weren't skipping here: or1k-softmmu rx-softmmu sh4eb-softmmu sparc64-softmmu tricore-softmmu xtensaeb-softmmu which then fall into the same bucket as alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu microblazeel-softmmu nios2-softmmu which are already not built in either cross-win*-system job. Is there a reason why we aren't covering those in Windows builds? thanks -- PMM
Peter Maydell <peter.maydell@linaro.org> writes:
> On Tue, 20 Feb 2024 at 18:46, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>>
>> On 20/2/24 18:44, Peter Maydell wrote:
>> > We don't support 32-bit Windows any more, so we don't need to defend it
>> > with this CI job.
>> >
>> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> > ---
>> > .gitlab-ci.d/container-cross.yml | 5 -
>> > .gitlab-ci.d/crossbuilds.yml | 14 ---
>> > .../dockerfiles/fedora-win32-cross.docker | 111 ------------------
>> > tests/lcitool/refresh | 5 -
>> > 4 files changed, 135 deletions(-)
>> > delete mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker
>>
>>
>> > diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
>> > index d19d98cde05..987ba9694ba 100644
>> > --- a/.gitlab-ci.d/crossbuilds.yml
>> > +++ b/.gitlab-ci.d/crossbuilds.yml
>> > @@ -159,20 +159,6 @@ cross-mips64el-kvm-only:
>> > IMAGE: debian-mips64el-cross
>> > EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu
>> >
>> > -cross-win32-system:
>> > - extends: .cross_system_build_job
>> > - needs:
>> > - job: win32-fedora-cross-container
>> > - variables:
>> > - IMAGE: fedora-win32-cross
>> > - EXTRA_CONFIGURE_OPTS: --enable-fdt=internal
>> > - CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu
>> > - microblazeel-softmmu mips64el-softmmu nios2-softmmu
>>
>> Thomas, is it possible to add mips64el-softmmu to the cross-win64-system
>> job or is it already at the timeout limit?
>
> This is a skip, i.e. exclude, list, not an include list. So dropping
> this job is not removing mips64el-softmmu from coverage.
> The Windows build coverage we lose will be the targets we
> are skipping in the cross-win64-system job and weren't
> skipping here:
> or1k-softmmu rx-softmmu sh4eb-softmmu sparc64-softmmu
> tricore-softmmu xtensaeb-softmmu
>
> which then fall into the same bucket as
> alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu
> microblazeel-softmmu nios2-softmmu
>
> which are already not built in either cross-win*-system job.
>
> Is there a reason why we aren't covering those in Windows
> builds?
I think it came down to the Windows builds being particularly prone to
timing out and these targets being fairly niche. Do we really expect to
catch build failures here that the other more featured targets wont?
BTW this is in addition to the default set of targets we skip for
crossbuilds:
- ../configure --enable-werror --disable-docs --enable-fdt=system
--disable-user $QEMU_CONFIGURE_OPTS $EXTRA_CONFIGURE_OPTS
--target-list-exclude="arm-softmmu cris-softmmu
i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu
sparc-softmmu xtensa-softmmu $CROSS_SKIP_TARGETS"
>
> thanks
> -- PMM
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
On Thu, 22 Feb 2024 at 12:21, Alex Bennée <alex.bennee@linaro.org> wrote: > > Peter Maydell <peter.maydell@linaro.org> writes: > > Is there a reason why we aren't covering those in Windows > > builds? > > I think it came down to the Windows builds being particularly prone to > timing out and these targets being fairly niche. Do we really expect to > catch build failures here that the other more featured targets wont? In my experience, yes, the weirdo host platforms (big-endian, 32-bit, Windows, BSD) are the ones that developers won't be testing on and that we therefore want to have CI for the full range of target configs on. It's safer to skip niche targets on non-niche hosts (read x86-64 Linux) because you can be reasonably sure the niche-target developers test on that host. thanks -- PMM
On 22/02/2024 12.44, Peter Maydell wrote: > On Tue, 20 Feb 2024 at 18:46, Philippe Mathieu-Daudé <philmd@linaro.org> wrote: >> >> On 20/2/24 18:44, Peter Maydell wrote: >>> We don't support 32-bit Windows any more, so we don't need to defend it >>> with this CI job. >>> >>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> >>> --- >>> .gitlab-ci.d/container-cross.yml | 5 - >>> .gitlab-ci.d/crossbuilds.yml | 14 --- >>> .../dockerfiles/fedora-win32-cross.docker | 111 ------------------ >>> tests/lcitool/refresh | 5 - >>> 4 files changed, 135 deletions(-) >>> delete mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker >> >> >>> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml >>> index d19d98cde05..987ba9694ba 100644 >>> --- a/.gitlab-ci.d/crossbuilds.yml >>> +++ b/.gitlab-ci.d/crossbuilds.yml >>> @@ -159,20 +159,6 @@ cross-mips64el-kvm-only: >>> IMAGE: debian-mips64el-cross >>> EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu >>> >>> -cross-win32-system: >>> - extends: .cross_system_build_job >>> - needs: >>> - job: win32-fedora-cross-container >>> - variables: >>> - IMAGE: fedora-win32-cross >>> - EXTRA_CONFIGURE_OPTS: --enable-fdt=internal >>> - CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu >>> - microblazeel-softmmu mips64el-softmmu nios2-softmmu >> >> Thomas, is it possible to add mips64el-softmmu to the cross-win64-system >> job or is it already at the timeout limit? > > This is a skip, i.e. exclude, list, not an include list. So dropping > this job is not removing mips64el-softmmu from coverage. > The Windows build coverage we lose will be the targets we > are skipping in the cross-win64-system job and weren't > skipping here: > or1k-softmmu rx-softmmu sh4eb-softmmu sparc64-softmmu > tricore-softmmu xtensaeb-softmmu > > which then fall into the same bucket as > alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu > microblazeel-softmmu nios2-softmmu > > which are already not built in either cross-win*-system job. > > Is there a reason why we aren't covering those in Windows > builds? I guess it's just an arbitrary list to keep the compilation time within the timeout limits. Thomas
On Tue, Feb 20, 2024 at 07:46:37PM +0100, Philippe Mathieu-Daudé wrote: > On 20/2/24 18:44, Peter Maydell wrote: > > We don't support 32-bit Windows any more, so we don't need to defend it > > with this CI job. > > > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > > --- > > .gitlab-ci.d/container-cross.yml | 5 - > > .gitlab-ci.d/crossbuilds.yml | 14 --- > > .../dockerfiles/fedora-win32-cross.docker | 111 ------------------ > > tests/lcitool/refresh | 5 - > > 4 files changed, 135 deletions(-) > > delete mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker > > > > diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml > > index d19d98cde05..987ba9694ba 100644 > > --- a/.gitlab-ci.d/crossbuilds.yml > > +++ b/.gitlab-ci.d/crossbuilds.yml > > @@ -159,20 +159,6 @@ cross-mips64el-kvm-only: > > IMAGE: debian-mips64el-cross > > EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu > > -cross-win32-system: > > - extends: .cross_system_build_job > > - needs: > > - job: win32-fedora-cross-container > > - variables: > > - IMAGE: fedora-win32-cross > > - EXTRA_CONFIGURE_OPTS: --enable-fdt=internal > > - CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu > > - microblazeel-softmmu mips64el-softmmu nios2-softmmu > > Thomas, is it possible to add mips64el-softmmu to the cross-win64-system > job or is it already at the timeout limit? If its too close to the limit, we could add across-win64-system-part2 job now we freed time from the deleting the win32 job. > > > - artifacts: > > - when: on_success > > - paths: > > - - build/qemu-setup*.exe > > - > > cross-win64-system: > > extends: .cross_system_build_job > > needs: > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 20/02/2024 19.55, Daniel P. Berrangé wrote: > On Tue, Feb 20, 2024 at 07:46:37PM +0100, Philippe Mathieu-Daudé wrote: >> On 20/2/24 18:44, Peter Maydell wrote: >>> We don't support 32-bit Windows any more, so we don't need to defend it >>> with this CI job. >>> >>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> >>> --- >>> .gitlab-ci.d/container-cross.yml | 5 - >>> .gitlab-ci.d/crossbuilds.yml | 14 --- >>> .../dockerfiles/fedora-win32-cross.docker | 111 ------------------ >>> tests/lcitool/refresh | 5 - >>> 4 files changed, 135 deletions(-) >>> delete mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker >> >> >>> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml >>> index d19d98cde05..987ba9694ba 100644 >>> --- a/.gitlab-ci.d/crossbuilds.yml >>> +++ b/.gitlab-ci.d/crossbuilds.yml >>> @@ -159,20 +159,6 @@ cross-mips64el-kvm-only: >>> IMAGE: debian-mips64el-cross >>> EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu >>> -cross-win32-system: >>> - extends: .cross_system_build_job >>> - needs: >>> - job: win32-fedora-cross-container >>> - variables: >>> - IMAGE: fedora-win32-cross >>> - EXTRA_CONFIGURE_OPTS: --enable-fdt=internal >>> - CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu >>> - microblazeel-softmmu mips64el-softmmu nios2-softmmu >> >> Thomas, is it possible to add mips64el-softmmu to the cross-win64-system >> job or is it already at the timeout limit? > > If its too close to the limit, we could add across-win64-system-part2 > job now we freed time from the deleting the win32 job. Looking at a recent run: https://gitlab.com/qemu-project/qemu/-/jobs/6189303285 It seems like we're in the 50 minutes range here, and timeout is set to 1h20m, so I think there should still be enough headroom for adding mips64el-softmmu to that job. Thomas
On Tue, Feb 20, 2024 at 05:44:11PM +0000, Peter Maydell wrote: > We don't support 32-bit Windows any more, so we don't need to defend it > with this CI job. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > .gitlab-ci.d/container-cross.yml | 5 - > .gitlab-ci.d/crossbuilds.yml | 14 --- > .../dockerfiles/fedora-win32-cross.docker | 111 ------------------ > tests/lcitool/refresh | 5 - > 4 files changed, 135 deletions(-) > delete mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Peter Maydell <peter.maydell@linaro.org> writes: > We don't support 32-bit Windows any more, so we don't need to defend it > with this CI job. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> -- Alex Bennée Virtualisation Tech Lead @ Linaro
© 2016 - 2024 Red Hat, Inc.