[libvirt PATCH 2/4] ci: Drop Fedora 36 target

Erik Skultety posted 4 patches 1 year, 1 month ago
[libvirt PATCH 2/4] ci: Drop Fedora 36 target
Posted by Erik Skultety 1 year, 1 month ago
Signed-off-by: Erik Skultety <eskultet@redhat.com>
---
 ci/buildenv/fedora-36.sh           |  96 -------------------------
 ci/containers/fedora-36.Dockerfile | 108 -----------------------------
 ci/gitlab/builds.yml               |  26 -------
 ci/gitlab/containers.yml           |   7 --
 ci/integration.yml                 |  40 -----------
 ci/manifest.yml                    |   8 ---
 6 files changed, 285 deletions(-)
 delete mode 100644 ci/buildenv/fedora-36.sh
 delete mode 100644 ci/containers/fedora-36.Dockerfile

diff --git a/ci/buildenv/fedora-36.sh b/ci/buildenv/fedora-36.sh
deleted file mode 100644
index 23886ae77c..0000000000
--- a/ci/buildenv/fedora-36.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    dnf update -y
-    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 \
-        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 \
-        systemd-devel \
-        systemd-rpm-macros \
-        systemtap-sdt-devel \
-        wireshark-devel \
-        xen-devel \
-        yajl-devel
-    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
-}
-
-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/fedora-36.Dockerfile b/ci/containers/fedora-36.Dockerfile
deleted file mode 100644
index df7a4a6bdc..0000000000
--- a/ci/containers/fedora-36.Dockerfile
+++ /dev/null
@@ -1,108 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.fedoraproject.org/fedora:36
-
-RUN dnf install -y nosync && \
-    printf '#!/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 "$@"\n' > /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 \
-               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 \
-               systemd-devel \
-               systemd-rpm-macros \
-               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 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 49c95143a3..ab55ae98c3 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -193,32 +193,6 @@ x86_64-debian-sid-local-env:
     NAME: debian-sid
 
 
-x86_64-fedora-36-prebuilt-env:
-  extends: .native_build_job_prebuilt_env
-  needs:
-    - job: x86_64-fedora-36-container
-      optional: true
-  allow_failure: false
-  variables:
-    NAME: fedora-36
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - libvirt-rpms
-
-x86_64-fedora-36-local-env:
-  extends: .native_build_job_local_env
-  needs: []
-  allow_failure: false
-  variables:
-    IMAGE: registry.fedoraproject.org/fedora:36
-    NAME: fedora-36
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - libvirt-rpms
-
-
 x86_64-fedora-37-prebuilt-env:
   extends: .native_build_job_prebuilt_env
   needs:
diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index d3bffa3b6c..2c775f5852 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -56,13 +56,6 @@ x86_64-debian-sid-container:
     NAME: debian-sid
 
 
-x86_64-fedora-36-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-36
-
-
 x86_64-fedora-37-container:
   extends: .container_job
   allow_failure: false
diff --git a/ci/integration.yml b/ci/integration.yml
index 5c0071d072..8dafff5c9a 100644
--- a/ci/integration.yml
+++ b/ci/integration.yml
@@ -81,46 +81,6 @@ centos-stream-9-tests-local-env:
       artifacts: true
 
 
-.fedora-36-tests:
-  variables:
-    # needed by libvirt-gitlab-executor
-    DISTRO: fedora-36
-    # 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-36-tests-prebuilt-env:
-  extends:
-    - .integration_tests_prebuilt_env
-    - .fedora-36-tests
-  needs:
-    - x86_64-fedora-36-prebuilt-env
-    - project: libvirt/libvirt-perl
-      job: x86_64-fedora-36-prebuilt-env
-      ref: master
-      artifacts: true
-    - project: libvirt/libvirt-python
-      job: x86_64-fedora-36-prebuilt-env
-      ref: master
-      artifacts: true
-
-fedora-36-tests-local-env:
-  extends:
-    - .integration_tests_local_env
-    - .fedora-36-tests
-  needs:
-    - x86_64-fedora-36-local-env
-    - project: libvirt/libvirt-perl
-      job: x86_64-fedora-36-prebuilt-env
-      ref: master
-      artifacts: true
-    - project: libvirt/libvirt-python
-      job: x86_64-fedora-36-prebuilt-env
-      ref: master
-      artifacts: true
-
-
 .fedora-37-tests:
   variables:
     # needed by libvirt-gitlab-executor
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 400e048e2b..1a5429e3bc 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -116,14 +116,6 @@ targets:
         containers: false
         builds: false
 
-  fedora-36:
-    jobs:
-      - arch: x86_64
-        artifacts:
-          expire_in: 1 day
-          paths:
-            - libvirt-rpms
-
   fedora-37:
     jobs:
       - arch: x86_64
-- 
2.40.0