9:01 a.m.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
ci/containers/fedora-34.Dockerfile | 109 -----------------------------
ci/gitlab.yml | 20 ------
ci/integration.yml | 16 -----
ci/manifest.yml | 8 ---
4 files changed, 153 deletions(-)
delete mode 100644 ci/containers/fedora-34.Dockerfile
diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile
deleted file mode 100644
index 6949231a62..0000000000
--- a/ci/containers/fedora-34.Dockerfile
+++ /dev/null
@@ -1,109 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.fedoraproject.org/fedora:34
-
-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 \
- bash-completion \
- ca-certificates \
- ccache \
- clang \
- codespell \
- cpp \
- cppi \
- 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 \
- 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-base \
- pkgconfig \
- polkit \
- python3 \
- python3-docutils \
- python3-flake8 \
- qemu-img \
- readline-devel \
- rpcgen \
- rpm-build \
- sanlock-devel \
- scrub \
- sed \
- sheepdog \
- systemd-devel \
- systemtap-sdt-devel \
- wireshark-devel \
- xen-devel \
- yajl-devel && \
- 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"
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index 07ad36809d..f4e3f189c0 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -142,13 +142,6 @@ x86_64-debian-sid-container:
NAME: debian-sid
-x86_64-fedora-34-container:
- extends: .container_job
- allow_failure: false
- variables:
- NAME: fedora-34
-
-
x86_64-fedora-35-container:
extends: .container_job
allow_failure: false
@@ -509,19 +502,6 @@ x86_64-debian-sid:
NAME: debian-sid
-x86_64-fedora-34:
- extends: .native_build_job
- needs:
- - x86_64-fedora-34-container
- allow_failure: false
- variables:
- NAME: fedora-34
- artifacts:
- expire_in: 1 day
- paths:
- - libvirt-rpms
-
-
x86_64-fedora-35:
extends: .native_build_job
needs:
diff --git a/ci/integration.yml b/ci/integration.yml
index 4978d3cf02..ecaa03fc3a 100644
--- a/ci/integration.yml
+++ b/ci/integration.yml
@@ -33,22 +33,6 @@ centos-stream-9-tests:
tags:
- $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
-fedora-34-tests:
- extends: .integration_tests
- needs:
- - x86_64-fedora-34
- - project: libvirt/libvirt-perl
- job: x86_64-fedora-34
- ref: master
- artifacts: true
- variables:
- # needed by libvirt-gitlab-executor
- DISTRO: fedora-34
- # 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
-
fedora-35-tests:
extends: .integration_tests
needs:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 38582da3a6..47bed03130 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -144,14 +144,6 @@ targets:
- arch: s390x
allow-failure: true
- fedora-34:
- jobs:
- - arch: x86_64
- artifacts:
- expire_in: 1 day
- paths:
- - libvirt-rpms
-
fedora-35:
jobs:
- arch: x86_64
--
2.35.3