On Wed, Nov 3, 2021 at 1:01 PM Daniel P. Berrangé <berra...@redhat.com> wrote:
> On Wed, Nov 03, 2021 at 10:48:44AM -0400, John Snow wrote: > > Or, more accurately, update our current Fedora container to Fedora 35, > > and then add a new fedora34 container and build test. > > > > Signed-off-by: John Snow <js...@redhat.com> > > --- > > .gitlab-ci.d/buildtest.yml | 16 ++++ > > .gitlab-ci.d/container-core.yml | 5 + > > tests/docker/dockerfiles/fedora.docker | 2 +- > > tests/docker/dockerfiles/fedora34.docker | 117 +++++++++++++++++++++++ > > We already struggle with having too much work in the CI pipeline > and will be in trouble when they start enforcing CI limits. > > With that in mind I'm not sure that having both Fedora versions > brings large enough benefit to justify the CI CPU time burnt. > > Fair. I'd say having stuff like ubuntu21.10 is more important than having both f34/f35. I have a keen interest on pushing forward into bleeding edge releases to identify potential issues sooner rather than later; and can generally trust that the older releases are well traveled through developer's personal machines. > If we did want both versions though, we should be consistent > with file naming - ie fedora35.dockre, not fedora.docker > to match fedora34.docker. > > OK. I was originally considering the "unversioned" file to be the "most recent one" that would update on a rolling schedule. On IRC you made a good point that when we fork a stable branch, we actually don't want this behavior. Explicit naming is therefore the best policy. I am still somewhat interested in having the F34 image, but we don't need it on the CI platform right now. Maybe it could be included later on as a target of lesser value to only be run occasionally, but I can worry about that a little later. > > 4 files changed, 139 insertions(+), 1 deletion(-) > > create mode 100644 tests/docker/dockerfiles/fedora34.docker > > > > diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml > > index 5c378e35f9..9d9330b646 100644 > > --- a/.gitlab-ci.d/buildtest.yml > > +++ b/.gitlab-ci.d/buildtest.yml > > @@ -100,6 +100,22 @@ acceptance-system-debian: > > IMAGE: debian-amd64 > > MAKE_CHECK_ARGS: check-acceptance > > > > +build-system-fedora34: > > + extends: .native_build_job_template > > + needs: > > + job: amd64-fedora34-container > > + variables: > > + IMAGE: fedora34 > > + CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs > > + --enable-fdt=system --enable-slirp=system > --enable-capstone=system > > + TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu > > + xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu > sparc64-softmmu > > + MAKE_CHECK_ARGS: check-build > > + artifacts: > > + expire_in: 2 days > > + paths: > > + - build > > + > > build-system-fedora: > > extends: .native_build_job_template > > needs: > > diff --git a/.gitlab-ci.d/container-core.yml > b/.gitlab-ci.d/container-core.yml > > index e8dd1f476a..96a71e88ff 100644 > > --- a/.gitlab-ci.d/container-core.yml > > +++ b/.gitlab-ci.d/container-core.yml > > @@ -6,6 +6,11 @@ amd64-centos8-container: > > variables: > > NAME: centos8 > > > > +amd64-fedora34-container: > > + extends: .container_job_template > > + variables: > > + NAME: fedora34 > > + > > amd64-fedora-container: > > extends: .container_job_template > > variables: > > diff --git a/tests/docker/dockerfiles/fedora.docker > b/tests/docker/dockerfiles/fedora.docker > > index 44d7f12110..24aca97cd7 100644 > > --- a/tests/docker/dockerfiles/fedora.docker > > +++ b/tests/docker/dockerfiles/fedora.docker > > @@ -1,4 +1,4 @@ > > -FROM registry.fedoraproject.org/fedora:34 > > +FROM registry.fedoraproject.org/fedora:35 > > > > # Please keep this list sorted alphabetically > > ENV PACKAGES \ > > diff --git a/tests/docker/dockerfiles/fedora34.docker > b/tests/docker/dockerfiles/fedora34.docker > > new file mode 100644 > > index 0000000000..44d7f12110 > > --- /dev/null > > +++ b/tests/docker/dockerfiles/fedora34.docker > > @@ -0,0 +1,117 @@ > > +FROM registry.fedoraproject.org/fedora:34 > > + > > +# Please keep this list sorted alphabetically > > +ENV PACKAGES \ > > + SDL2-devel \ > > + SDL2_image-devel \ > > + alsa-lib-devel \ > > + bc \ > > + brlapi-devel \ > > + bzip2 \ > > + bzip2-devel \ > > + ca-certificates \ > > + capstone-devel \ > > + ccache \ > > + clang \ > > + ctags \ > > + cyrus-sasl-devel \ > > + daxctl-devel \ > > + dbus-daemon \ > > + device-mapper-multipath-devel \ > > + diffutils \ > > + findutils \ > > + gcc \ > > + gcc-c++ \ > > + gcovr \ > > + genisoimage \ > > + gettext \ > > + git \ > > + glib2-devel \ > > + glibc-langpack-en \ > > + glibc-static \ > > + glusterfs-api-devel \ > > + gnutls-devel \ > > + gtk3-devel \ > > + hostname \ > > + jemalloc-devel \ > > + libaio-devel \ > > + libasan \ > > + libattr-devel \ > > + libbpf-devel \ > > + libcacard-devel \ > > + libcap-ng-devel \ > > + libcurl-devel \ > > + libdrm-devel \ > > + libepoxy-devel \ > > + libfdt-devel \ > > + libffi-devel \ > > + libgcrypt-devel \ > > + libiscsi-devel \ > > + libjpeg-devel \ > > + libnfs-devel \ > > + libpmem-devel \ > > + libpng-devel \ > > + librbd-devel \ > > + libseccomp-devel \ > > + libslirp-devel \ > > + libssh-devel \ > > + libtasn1-devel \ > > + libubsan \ > > + libudev-devel \ > > + liburing-devel \ > > + libusbx-devel \ > > + libxml2-devel \ > > + libzstd-devel \ > > + llvm \ > > + lttng-ust-devel \ > > + lzo-devel \ > > + make \ > > + mesa-libgbm-devel \ > > + meson \ > > + ncurses-devel \ > > + nettle-devel \ > > + ninja-build \ > > + nmap-ncat \ > > + numactl-devel \ > > + openssh-clients \ > > + pam-devel \ > > + perl-Test-Harness \ > > + perl-base \ > > + pixman-devel \ > > + pkgconfig \ > > + pulseaudio-libs-devel \ > > + python3 \ > > + python3-PyYAML \ > > + python3-numpy \ > > + python3-opencv \ > > + python3-pillow \ > > + python3-pip \ > > + python3-sphinx \ > > + python3-sphinx_rtd_theme \ > > + python3-virtualenv \ > > + rdma-core-devel \ > > + rpm \ > > + sed \ > > + snappy-devel \ > > + sparse \ > > + spice-protocol \ > > + spice-server-devel \ > > + systemd-devel \ > > + systemtap-sdt-devel \ > > + tar \ > > + tesseract \ > > + tesseract-langpack-eng \ > > + texinfo \ > > + usbredir-devel \ > > + util-linux \ > > + virglrenderer-devel \ > > + vte291-devel \ > > + which \ > > + xen-devel \ > > + xfsprogs-devel \ > > + zlib-devel > > +ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 > > + > > +RUN dnf install -y $PACKAGES > > +RUN rpm -q $PACKAGES | sort > /packages.txt > > +ENV PATH $PATH:/usr/libexec/python3-sphinx/ > > -- > > 2.31.1 > > > > 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 :| > >
