This drops the CentOS 8 Stream distro target, since that is going EOL at the end of May, at which point it will cease to be installable due to package repos being archived. Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx> --- ci/buildenv/centos-stream-8.sh | 104 ---------------------- ci/containers/centos-stream-8.Dockerfile | 107 ----------------------- ci/gitlab/builds.yml | 15 ---- ci/gitlab/containers.yml | 7 -- ci/integration.yml | 24 ----- ci/manifest.yml | 8 -- 6 files changed, 265 deletions(-) delete mode 100644 ci/buildenv/centos-stream-8.sh delete mode 100644 ci/containers/centos-stream-8.Dockerfile diff --git a/ci/buildenv/centos-stream-8.sh b/ci/buildenv/centos-stream-8.sh deleted file mode 100644 index 542b2a70ba..0000000000 --- a/ci/buildenv/centos-stream-8.sh +++ /dev/null @@ -1,104 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - dnf distro-sync -y - dnf install 'dnf-command(config-manager)' -y - dnf config-manager --set-enabled -y powertools - dnf install -y centos-release-advanced-virtualization - dnf install -y epel-release - dnf install -y epel-next-release - dnf install -y \ - audit-libs-devel \ - augeas \ - bash-completion \ - ca-certificates \ - ccache \ - clang \ - cpp \ - cyrus-sasl-devel \ - device-mapper-devel \ - diffutils \ - 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 \ - libnbd-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ - libwsman-devel \ - libxml2 \ - libxml2-devel \ - libxslt \ - lvm2 \ - make \ - meson \ - netcf-devel \ - nfs-utils \ - ninja-build \ - numactl-devel \ - numad \ - parted-devel \ - perl \ - pkgconfig \ - polkit \ - python3 \ - python3-docutils \ - python3-flake8 \ - python3-pip \ - python3-pytest \ - python3-setuptools \ - python3-wheel \ - qemu-img \ - readline-devel \ - rpm-build \ - sanlock-devel \ - sed \ - systemd-devel \ - systemd-rpm-macros \ - systemtap-sdt-devel \ - wireshark-devel \ - yajl-devel - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - 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 - /usr/bin/pip3 install black -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile deleted file mode 100644 index 5765c6dfc2..0000000000 --- a/ci/containers/centos-stream-8.Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM quay.io/centos/centos:stream8 - -RUN dnf distro-sync -y && \ - dnf install 'dnf-command(config-manager)' -y && \ - dnf config-manager --set-enabled -y powertools && \ - dnf install -y centos-release-advanced-virtualization && \ - dnf install -y epel-release && \ - dnf install -y epel-next-release && \ - dnf install -y \ - audit-libs-devel \ - augeas \ - bash-completion \ - ca-certificates \ - ccache \ - clang \ - cpp \ - cyrus-sasl-devel \ - device-mapper-devel \ - diffutils \ - 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 \ - libnbd-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ - libwsman-devel \ - libxml2 \ - libxml2-devel \ - libxslt \ - lvm2 \ - make \ - meson \ - netcf-devel \ - nfs-utils \ - ninja-build \ - numactl-devel \ - numad \ - parted-devel \ - perl \ - pkgconfig \ - polkit \ - python3 \ - python3-docutils \ - python3-flake8 \ - python3-pip \ - python3-pytest \ - python3-setuptools \ - python3-wheel \ - qemu-img \ - readline-devel \ - rpm-build \ - sanlock-devel \ - sed \ - systemd-devel \ - systemd-rpm-macros \ - systemtap-sdt-devel \ - wireshark-devel \ - yajl-devel && \ - dnf autoremove -y && \ - dnf clean all -y && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \ - 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 /usr/bin/pip3 install black - -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" diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index b23a3989b9..1629e02525 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -55,21 +55,6 @@ x86_64-alpine-edge: TARGET_BASE_IMAGE: docker.io/library/alpine:edge -x86_64-centos-stream-8: - extends: .native_build_job - needs: - - job: x86_64-centos-stream-8-container - optional: true - allow_failure: false - variables: - NAME: centos-stream-8 - TARGET_BASE_IMAGE: quay.io/centos/centos:stream8 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - - x86_64-centos-stream-9: extends: .native_build_job needs: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index add5e2360f..b7ae60b10a 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -28,13 +28,6 @@ x86_64-alpine-edge-container: NAME: alpine-edge -x86_64-centos-stream-8-container: - extends: .container_job - allow_failure: false - variables: - NAME: centos-stream-8 - - x86_64-centos-stream-9-container: extends: .container_job allow_failure: false diff --git a/ci/integration.yml b/ci/integration.yml index f754c59962..d3859c54e8 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -1,30 +1,6 @@ include: - 'ci/integration-template.yml' -# NOTE The integration tests use artifacts produced by the libvirt-perl -# and libvirt-python CI jobs, so the new target needs to be introduced -# there before it can be used here. The VM template for the target -# also needs to be created on the runner host. -centos-stream-8-tests: - extends: .integration_tests - variables: - # needed by libvirt-gitlab-executor - DISTRO: centos-stream-8 - # can be overridden in forks to set a different runner tag - LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host - tags: - - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG - needs: - - x86_64-centos-stream-8 - - project: libvirt/libvirt-perl - job: x86_64-centos-stream-8 - ref: master - artifacts: true - - project: libvirt/libvirt-python - job: x86_64-centos-stream-8 - ref: master - artifacts: true - # NOTE The integration tests use artifacts produced by the libvirt-perl # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target diff --git a/ci/manifest.yml b/ci/manifest.yml index 44353dd05b..84d31866fc 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -26,14 +26,6 @@ targets: - arch: x86_64 allow-failure: true - centos-stream-8: - jobs: - - arch: x86_64 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - centos-stream-9: jobs: - arch: x86_64 -- 2.43.0 _______________________________________________ Devel mailing list -- devel@xxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx