summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Skultety <eskultet@redhat.com>2023-05-03 08:57:39 +0200
committerErik Skultety <eskultet@redhat.com>2023-05-03 09:09:53 +0200
commitfc7022b972350ba89c9e1c2883cae5e7a1501464 (patch)
tree21ee6197fdb60a931b30cd88ff195dbcf2962532
parent4994b9688351679b217de35d110ea20b19018083 (diff)
downloadlibvirt-python-fc7022b972350ba89c9e1c2883cae5e7a1501464.tar.gz
ci: Drop Fedora 36 targetHEADmaster
Signed-off-by: Erik Skultety <eskultet@redhat.com>
-rw-r--r--ci/buildenv/fedora-36.sh32
-rw-r--r--ci/containers/fedora-36.Dockerfile44
-rw-r--r--ci/gitlab/builds.yml26
-rw-r--r--ci/gitlab/containers.yml7
-rw-r--r--ci/manifest.yml8
5 files changed, 0 insertions, 117 deletions
diff --git a/ci/buildenv/fedora-36.sh b/ci/buildenv/fedora-36.sh
deleted file mode 100644
index a7d0e1b..0000000
--- a/ci/buildenv/fedora-36.sh
+++ /dev/null
@@ -1,32 +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 \
- ca-certificates \
- ccache \
- gcc \
- git \
- glibc-langpack-en \
- libvirt-devel \
- pkgconfig \
- python3 \
- python3-devel \
- python3-lxml \
- python3-pip \
- python3-pytest \
- python3-setuptools \
- rpm-build
- 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
-}
-
-export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
-export LANG="en_US.UTF-8"
-export PYTHON="/usr/bin/python3"
diff --git a/ci/containers/fedora-36.Dockerfile b/ci/containers/fedora-36.Dockerfile
deleted file mode 100644
index f490d98..0000000
--- a/ci/containers/fedora-36.Dockerfile
+++ /dev/null
@@ -1,44 +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 \
- ca-certificates \
- ccache \
- gcc \
- git \
- glibc-langpack-en \
- libvirt-devel \
- pkgconfig \
- python3 \
- python3-devel \
- python3-lxml \
- python3-pip \
- python3-pytest \
- python3-setuptools \
- rpm-build && \
- 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 CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-ENV LANG "en_US.UTF-8"
-ENV PYTHON "/usr/bin/python3"
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 6087fe3..86fe097 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -125,32 +125,6 @@ x86_64-debian-sid-local-env:
PIP_INSTALL: install --break-system-packages
-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 hour
- paths:
- - libvirt-python-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 hour
- paths:
- - libvirt-python-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 3d7398a..a9661d6 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -35,13 +35,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/manifest.yml b/ci/manifest.yml
index 8305924..36df464 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -47,14 +47,6 @@ targets:
variables:
PIP_INSTALL: install --break-system-packages
- fedora-36:
- jobs:
- - arch: x86_64
- artifacts:
- expire_in: 1 hour
- paths:
- - libvirt-python-rpms
-
fedora-37:
jobs:
- arch: x86_64