diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7d2b30ab5..35ec626113 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -133,11 +133,6 @@ stages: # Native container build jobs -x64-centos-7-container: - extends: .container_job - variables: - NAME: centos-7 - x64-centos-8-container: extends: .container_job variables: @@ -316,17 +311,6 @@ x64-debian-sid: variables: NAME: debian-sid -x64-centos-7: - extends: .native_build_job - needs: - - x64-centos-7-container - variables: - NAME: centos-7 - # meson dist fails on CentOS 7 because of old git that fails to clone - # from shallow git repository which is done when running meson dist - DIST: skip - RPM: skip - x64-centos-8: extends: .native_build_job needs: diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile deleted file mode 100644 index 49345fa128..0000000000 --- a/ci/containers/centos-7.Dockerfile +++ /dev/null @@ -1,138 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile centos-7 libvirt -# -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca542937f7d4ea - -FROM docker.io/library/centos:7 - -RUN yum update -y && \ - echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \ - echo -e '[openvz]\n\ -name=OpenVZ addons\n\ -baseurl=https://download.openvz.org/virtuozzo/releases/openvz-7.0.11-235/x86_64/os/\n\ -enabled=1\n\ -gpgcheck=1\n\ -skip_if_unavailable=0\n\ -metadata_expire=6h\n\ -priority=90\n\ -includepkgs=libprl*' > /etc/yum.repos.d/openvz.repo && \ - echo -e '-----BEGIN PGP PUBLIC KEY BLOCK-----\n\ -Version: GnuPG v2.0.22 (GNU/Linux)\n\ -\n\ -mI0EVl80nQEEAKrEeyeTCwrzS9kYedZ/sAc/GUqlb81C7pA9SaR3fyck5mVw1Ogk\n\ -YdmNBPM2kY7QDxR9F0EpSpnxSCAXZXugsQ8KzZ0DRLVeBDQyGs9IGK5hI0zzxIil\n\ -BzfvIexLiQQhLy7YlIi8Jt/uUqKkW0pIMNMGcduY97VATtczpncpkmSzABEBAAG0\n\ -SFZpcnR1b3p6byBUZWFtIChHUEcga2V5IHNpZ25hdHVyZSBmb3IgcGFja2FnZXMp\n\ -IDxzZWN1cml0eUB2aXJ0dW96em8uY29tPoi5BBMBAgAjBQJWXzSdAhsDBwsJCAcD\n\ -AgEGFQgCCQoLBBYCAwECHgECF4AACgkQygt9GUTNrSruIgP/er70Eyo73A1gfrjv\n\ -oPUkyo4rslVRZu3qqCwoMFtJc/Z/UxWgEka1buorlcGLa6eO/EZ49c0n+KGa4Kvt\n\ -EUboIq0yEu5i0FyAj92ifm+hNhoAbGfm0cZ4/fD0oGr3l8OsQo4+iHX4xAPwFe7Y\n\ -zABuB8I1ZDZ4OIp5tDfTTuF2LT24jQRWXzSdAQQAog2Aqb+Ptl68O7cQhWLjVGkj\n\ -yyigZrdeReLx3HloKJPBeQ/kA6uvMJc/IYS3uppMWXv9v+QenS6uhP1TUJ2k9FvM\n\ -t94MQZfALN7Vpf8AF+UeWu4Ru+y4BNzcFhrPhIFNFChOR2QqW6FkgE57D9I177NC\n\ -oJMyrlNe8wcGa178An8AEQEAAYifBBgBAgAJBQJWXzSdAhsMAAoJEMoLfRlEza0q\n\ -bKwD/3+OFVIEXnIv5XgdGRNX5fHggsUN1bb8gva7HANRlKdd4LD8foDM3F/yv/3V\n\ -igG14D5EjKz56SaBDNgiI4++hOzb2M8jhAsR86jxkXFrrP1U3ZNRKg6av9DPFAPS\n\ -WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ -=fRMg\n\ ------END PGP PUBLIC KEY BLOCK-----' > /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ && \ - rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ && \ - yum install -y epel-release && \ - yum install -y centos-release-xen-48 && \ - yum install -y \ - audit-libs-devel \ - augeas \ - avahi-devel \ - bash-completion \ - ca-certificates \ - ccache \ - clang \ - cpp \ - cyrus-sasl-devel \ - dbus-devel \ - device-mapper-devel \ - diffutils \ - dnsmasq \ - dwarves \ - ebtables \ - firewalld-filesystem \ - fuse-devel \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-common \ - glibc-devel \ - glusterfs-api-devel \ - gnutls-devel \ - grep \ - iproute \ - iptables \ - iscsi-initiator-utils \ - kmod \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libiscsi-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - libprlsdk-devel \ - librbd1-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ - libudev-devel \ - libwsman-devel \ - libxml2 \ - libxml2-devel \ - libxslt \ - lvm2 \ - make \ - netcf-devel \ - nfs-utils \ - ninja-build \ - numactl-devel \ - numad \ - parted \ - parted-devel \ - perl \ - pkgconfig \ - polkit \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - python36-docutils \ - qemu-img \ - radvd \ - readline-devel \ - rpm-build \ - sanlock-devel \ - scrub \ - sed \ - systemtap-sdt-devel \ - wireshark-devel \ - xen-devel \ - xfsprogs-devel \ - yajl-devel && \ - yum autoremove -y && \ - yum 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 - -RUN pip3 install \ - meson==0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja-build" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"