diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 069f625b19..a7d2b30ab5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,11 +158,6 @@ x64-debian-sid-container: variables: NAME: debian-sid -x64-fedora-32-container: - extends: .container_job - variables: - NAME: fedora-32 - x64-fedora-33-container: extends: .container_job variables: @@ -357,14 +352,6 @@ x64-centos-stream-8: NAME: centos-stream-8 RPM: skip -x64-fedora-32: - extends: .native_build_job - needs: - - x64-fedora-32-container - variables: - NAME: fedora-32 - RPM: skip - x64-fedora-33: extends: .native_build_job needs: diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile deleted file mode 100644 index 9b06bcbac5..0000000000 --- a/ci/containers/fedora-32.Dockerfile +++ /dev/null @@ -1,115 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile fedora-32 libvirt -# -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca542937f7d4ea - -FROM registry.fedoraproject.org/fedora:32 - -RUN dnf install -y nosync && \ - echo -e '#!/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 "$@"' > /usr/bin/nosync && \ - chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ - nosync dnf install -y \ - audit-libs-devel \ - augeas \ - avahi-devel \ - bash-completion \ - ca-certificates \ - ccache \ - clang \ - cpp \ - cppi \ - cyrus-sasl-devel \ - dbus-devel \ - device-mapper-devel \ - diffutils \ - dnsmasq \ - dwarves \ - ebtables \ - firewalld-filesystem \ - fuse-devel \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-devel \ - glibc-langpack-en \ - glusterfs-api-devel \ - gnutls-devel \ - grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libiscsi-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ - libudev-devel \ - libwsman-devel \ - libxml2 \ - libxml2-devel \ - libxslt \ - lvm2 \ - make \ - meson \ - netcf-devel \ - nfs-utils \ - ninja-build \ - numactl-devel \ - numad \ - parted \ - parted-devel \ - perl \ - pkgconfig \ - polkit \ - python3 \ - python3-docutils \ - python3-flake8 \ - qemu-img \ - radvd \ - readline-devel \ - rpcgen \ - rpm-build \ - sanlock-devel \ - scrub \ - sed \ - sheepdog \ - systemtap-sdt-devel \ - wireshark-devel \ - xen-devel \ - xfsprogs-devel \ - yajl-devel \ - zfs-fuse && \ - nosync dnf autoremove -y && \ - 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/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"