diff options
author | Andrea Bolognani <abologna@redhat.com> | 2021-11-12 16:09:49 +0100 |
---|---|---|
committer | Andrea Bolognani <abologna@redhat.com> | 2021-11-12 16:09:49 +0100 |
commit | da638056094ad7bf86405bca5bb8cec1792d23cf (patch) | |
tree | ce89b77c091ac256c24d6363d588d4392469f70f | |
parent | 0cf18c28bbb18fef643550b38b57fd8a31924d42 (diff) | |
download | libosinfo-da638056094ad7bf86405bca5bb8cec1792d23cf.tar.gz |
ci: Drop Fedora 33
It's going to be EOL in a matter of days, and lcitool already
dropped support for it.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-rw-r--r-- | ci/containers/fedora-33.Dockerfile | 62 | ||||
-rw-r--r-- | ci/gitlab.yml | 16 | ||||
-rw-r--r-- | ci/manifest.yml | 2 |
3 files changed, 0 insertions, 80 deletions
diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile deleted file mode 100644 index 0e651aa..0000000 --- a/ci/containers/fedora-33.Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM registry.fedoraproject.org/fedora:33 - -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 \ - ca-certificates \ - ccache \ - check-devel \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-langpack-en \ - gobject-introspection-devel \ - gtk-doc \ - hwdata \ - intltool \ - itstool \ - libsoup-devel \ - libxml2 \ - libxml2-devel \ - libxslt-devel \ - make \ - meson \ - ninja-build \ - osinfo-db-tools \ - pkgconfig \ - python3 \ - python3-lxml \ - python3-pytest \ - python3-requests \ - rpm-build \ - vala \ - wget \ - xz && \ - 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/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 802654c..5ddf1c7 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -78,13 +78,6 @@ x86_64-debian-sid-container: NAME: debian-sid -x86_64-fedora-33-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-33 - - x86_64-fedora-34-container: extends: .container_job allow_failure: false @@ -184,15 +177,6 @@ x86_64-debian-sid: NAME: debian-sid -x86_64-fedora-33: - extends: .native_build_job - needs: - - x86_64-fedora-33-container - allow_failure: false - variables: - NAME: fedora-33 - - x86_64-fedora-34: extends: .native_build_job needs: diff --git a/ci/manifest.yml b/ci/manifest.yml index 9af52f7..e8891be 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -24,8 +24,6 @@ targets: debian-sid: x86_64 - fedora-33: x86_64 - fedora-34: x86_64 fedora-rawhide: |