diff options
author | Andrea Bolognani <abologna@redhat.com> | 2021-11-12 16:12:48 +0100 |
---|---|---|
committer | Andrea Bolognani <abologna@redhat.com> | 2021-11-12 16:12:48 +0100 |
commit | c0a666142a12304d156bce46760a830767056357 (patch) | |
tree | cbddb46be8147d77204bd2186a85d6326317a860 | |
parent | a0e7453618507329b0570fa82c58fabc57fc3572 (diff) | |
download | libosinfo-c0a666142a12304d156bce46760a830767056357.tar.gz |
ci: Add new targets
lcitool now supports CentOS Stream 9, Debian 11 and Fedora 35.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-rw-r--r-- | ci/containers/centos-stream-9.Dockerfile | 47 | ||||
-rw-r--r-- | ci/containers/debian-11.Dockerfile | 54 | ||||
-rw-r--r-- | ci/containers/fedora-35.Dockerfile | 60 | ||||
-rw-r--r-- | ci/gitlab.yml | 48 | ||||
-rw-r--r-- | ci/manifest.yml | 6 |
5 files changed, 215 insertions, 0 deletions
diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile new file mode 100644 index 0000000..7914630 --- /dev/null +++ b/ci/containers/centos-stream-9.Dockerfile @@ -0,0 +1,47 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM quay.io/centos/centos:stream9 + +RUN dnf update -y && \ + dnf install 'dnf-command(config-manager)' -y && \ + dnf config-manager --set-enabled -y crb && \ + dnf install -y \ + ca-certificates \ + check-devel \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + gobject-introspection-devel \ + gtk-doc \ + hwdata \ + 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 && \ + dnf autoremove -y && \ + dnf clean all -y && \ + rpm -qa | sort > /packages.txt + +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/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile new file mode 100644 index 0000000..60aa956 --- /dev/null +++ b/ci/containers/debian-11.Dockerfile @@ -0,0 +1,54 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + ca-certificates \ + ccache \ + check \ + gcc \ + gettext \ + git \ + gtk-doc-tools \ + hwdata \ + libgirepository1.0-dev \ + libglib2.0-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxml2-utils \ + libxslt1-dev \ + locales \ + make \ + meson \ + ninja-build \ + osinfo-db-tools \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + valac \ + wget \ + xz-utils && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /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/containers/fedora-35.Dockerfile b/ci/containers/fedora-35.Dockerfile new file mode 100644 index 0000000..fccabd7 --- /dev/null +++ b/ci/containers/fedora-35.Dockerfile @@ -0,0 +1,60 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.fedoraproject.org/fedora:35 + +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 \ + 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 17ae3d1..8238c38 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -64,6 +64,13 @@ x86_64-centos-stream-8-container: NAME: centos-stream-8 +x86_64-centos-stream-9-container: + extends: .container_job + allow_failure: false + variables: + NAME: centos-stream-9 + + x86_64-debian-10-container: extends: .container_job allow_failure: false @@ -71,6 +78,13 @@ x86_64-debian-10-container: NAME: debian-10 +x86_64-debian-11-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-11 + + x86_64-debian-sid-container: extends: .container_job allow_failure: false @@ -85,6 +99,13 @@ x86_64-fedora-34-container: NAME: fedora-34 +x86_64-fedora-35-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-35 + + x86_64-fedora-rawhide-container: extends: .container_job allow_failure: false @@ -157,6 +178,15 @@ x86_64-centos-stream-8: NAME: centos-stream-8 +x86_64-centos-stream-9: + extends: .native_build_job + needs: + - x86_64-centos-stream-9-container + allow_failure: false + variables: + NAME: centos-stream-9 + + x86_64-debian-10: extends: .native_build_job needs: @@ -166,6 +196,15 @@ x86_64-debian-10: NAME: debian-10 +x86_64-debian-11: + extends: .native_build_job + needs: + - x86_64-debian-11-container + allow_failure: false + variables: + NAME: debian-11 + + x86_64-debian-sid: extends: .native_build_job needs: @@ -184,6 +223,15 @@ x86_64-fedora-34: NAME: fedora-34 +x86_64-fedora-35: + extends: .native_build_job + needs: + - x86_64-fedora-35-container + allow_failure: false + variables: + NAME: fedora-35 + + x86_64-fedora-rawhide: extends: .native_build_job needs: diff --git a/ci/manifest.yml b/ci/manifest.yml index 4f623e7..c5f669b 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -12,12 +12,18 @@ targets: centos-stream-8: x86_64 + centos-stream-9: x86_64 + debian-10: x86_64 + debian-11: x86_64 + debian-sid: x86_64 fedora-34: x86_64 + fedora-35: x86_64 + fedora-rawhide: jobs: - arch: x86_64 |