From 4994b9688351679b217de35d110ea20b19018083 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Wed, 3 May 2023 08:57:58 +0200 Subject: ci: Add Fedora 38 target Signed-off-by: Erik Skultety --- ci/buildenv/fedora-38.sh | 32 +++++++++++++++++++++++++++ ci/containers/fedora-38.Dockerfile | 44 ++++++++++++++++++++++++++++++++++++++ ci/gitlab/builds.yml | 26 ++++++++++++++++++++++ ci/gitlab/containers.yml | 7 ++++++ ci/manifest.yml | 8 +++++++ 5 files changed, 117 insertions(+) create mode 100644 ci/buildenv/fedora-38.sh create mode 100644 ci/containers/fedora-38.Dockerfile diff --git a/ci/buildenv/fedora-38.sh b/ci/buildenv/fedora-38.sh new file mode 100644 index 0000000..a7d0e1b --- /dev/null +++ b/ci/buildenv/fedora-38.sh @@ -0,0 +1,32 @@ +# 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-38.Dockerfile b/ci/containers/fedora-38.Dockerfile new file mode 100644 index 0000000..6dedf6b --- /dev/null +++ b/ci/containers/fedora-38.Dockerfile @@ -0,0 +1,44 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.fedoraproject.org/fedora:38 + +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 f8bc8b7..6087fe3 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -177,6 +177,32 @@ x86_64-fedora-37-local-env: - libvirt-python-rpms +x86_64-fedora-38-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-fedora-38-container + optional: true + allow_failure: false + variables: + NAME: fedora-38 + artifacts: + expire_in: 1 hour + paths: + - libvirt-python-rpms + +x86_64-fedora-38-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: registry.fedoraproject.org/fedora:38 + NAME: fedora-38 + artifacts: + expire_in: 1 hour + paths: + - libvirt-python-rpms + + x86_64-fedora-rawhide-prebuilt-env: extends: .native_build_job_prebuilt_env needs: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index ffa6c27..3d7398a 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -49,6 +49,13 @@ x86_64-fedora-37-container: NAME: fedora-37 +x86_64-fedora-38-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-38 + + x86_64-fedora-rawhide-container: extends: .container_job allow_failure: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 6577b96..8305924 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -63,6 +63,14 @@ targets: paths: - libvirt-python-rpms + fedora-38: + jobs: + - arch: x86_64 + artifacts: + expire_in: 1 hour + paths: + - libvirt-python-rpms + fedora-rawhide: jobs: - arch: x86_64 -- cgit v1.2.1