On Wed, Oct 12, 2022 at 11:08:55AM +0200, Paolo Bonzini wrote: > Container-based cross compilers have some issues which were overlooked > when they were only used for TCG tests, but are more visible since > firmware builds try to use them: > > - Downloading and building containers as part of make adds a > very long task to the build, unless you are on a fast network. > Container images can be hundreds of MBs. > > - Verbose progress information from the container builds > is printed on stderr and messes up other output from > make/ninja > > - There seem to be some rough edges around failure too. > > So, make container builds opt-in. > > Reported-by: Daniel P. Berrangé <berra...@redhat.com> > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > .gitlab-ci.d/buildtest.yml | 16 ++++++++-------- > .gitlab-ci.d/crossbuilds.yml | 2 +- > .../custom-runners/ubuntu-20.04-s390x.yml | 2 +- > .../custom-runners/ubuntu-22.04-aarch64.yml | 2 +- > configure | 4 ++-- > 5 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml > index 6c05c46397..41742ae962 100644 > --- a/.gitlab-ci.d/buildtest.yml > +++ b/.gitlab-ci.d/buildtest.yml > @@ -263,7 +263,7 @@ build-user: > job: amd64-debian-user-cross-container > variables: > IMAGE: debian-all-test-cross > - CONFIGURE_ARGS: --disable-tools --disable-system > + CONFIGURE_ARGS: --disable-tools --disable-system --enable-containers > MAKE_CHECK_ARGS: check-tcg
Are you sure these jobs wer using containers in the first place ? A standard gitlab CI environment isn't able to use normal docker, and the build jobs aren't configured with the docker-in-docker service. So I'd be surprised if any were using the container logic. I guess we auto-detect if it works, so silently skip them, but its probably misleading to add --enable-containers to an env we don't expect to use them. > diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml > b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml > index 0c835939db..24bca3f995 100644 > --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml > +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml > @@ -16,7 +16,7 @@ ubuntu-20.04-s390x-all-linux-static: > # --disable-glusterfs is needed because there's no static version of those > libs in distro supplied packages > - mkdir build > - cd build > - - ../configure --enable-debug --static --disable-system --disable-glusterfs > --disable-libssh > + - ../configure --enable-debug --static --disable-system --disable-glusterfs > --disable-libssh --enable-containers > || { cat config.log meson-logs/meson-log.txt; exit 1; } > - make --output-sync -j`nproc` > - make --output-sync -j`nproc` check V=1 > diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml > b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml > index ce0b18af6f..db0c919fab 100644 > --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml > +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml > @@ -16,7 +16,7 @@ ubuntu-22.04-aarch64-all-linux-static: > - cd build > # Disable -static-pie due to build error with system libc: > # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438 > - - ../configure --enable-debug --static --disable-system --disable-pie > + - ../configure --enable-debug --static --disable-system --disable-pie > --enable-containers > || { cat config.log meson-logs/meson-log.txt; exit 1; } > - make --output-sync -j`nproc --ignore=40` > - make --output-sync -j`nproc --ignore=40` check V=1 These changes are likely ok, as the custom runners are bare metal so can use containers normally, provided docker/podman is installed. > diff --git a/configure b/configure > index baa69189f0..6fa158a0d4 100755 > --- a/configure > +++ b/configure > @@ -227,7 +227,7 @@ cross_prefix="" > host_cc="cc" > stack_protector="" > safe_stack="" > -use_containers="yes" > +use_containers="no" > gdb_bin=$(command -v "gdb-multiarch" || command -v "gdb") > > if test -e "$source_path/.git" > @@ -1034,7 +1034,7 @@ Advanced options (experts only): > ucontext, sigaltstack, windows > --enable-plugins > enable plugins via shared library loading > - --disable-containers don't use containers for cross-building > + --enable-containers use containers for cross-building > --gdb=GDB-path gdb to use for gdbstub tests [$gdb_bin] > EOF > meson_options_help > -- > 2.37.3 > 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 :|