7:33 a.m.
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/516876671
Andrea Bolognani (6):
ci: Drop FreeBSD -CURRENT
ci: Simplify Alpine Linux 3.14 definition
ci: Add Alpine Linux 3.15
ci: Add openSUSE Leap 15.3
ci: Move codestyle job to openSUSE Leap 15.3
ci: Drop openSUSE Leap 15.2
.gitlab-ci.yml | 4 +-
ci/cirrus/freebsd-current.vars | 16 ----
ci/containers/alpine-315.Dockerfile | 80 +++++++++++++++++++
...ockerfile => opensuse-leap-153.Dockerfile} | 2 +-
ci/gitlab.yml | 26 ++++--
ci/manifest.yml | 14 +---
6 files changed, 108 insertions(+), 34 deletions(-)
delete mode 100644 ci/cirrus/freebsd-current.vars
create mode 100644 ci/containers/alpine-315.Dockerfile
rename ci/containers/{opensuse-leap-152.Dockerfile => opensuse-leap-153.Dockerfile}
(98%)
--
2.35.1
7:33 a.m.
New subject: [libvirt PATCH 1/6] ci: Drop FreeBSD -CURRENT
All build jobs for the target are explicitly disabled, so
there's no point in keeping the variables file around and we
can't simply not mention it in the manifest at all.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/cirrus/freebsd-current.vars | 16 ----------------
ci/manifest.yml | 6 ------
2 files changed, 22 deletions(-)
delete mode 100644 ci/cirrus/freebsd-current.vars
diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars
deleted file mode 100644
index e8b06b32e1..0000000000
--- a/ci/cirrus/freebsd-current.vars
+++ /dev/null
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-CCACHE='/usr/local/bin/ccache'
-CPAN_PKGS=''
-CROSS_PKGS=''
-MAKE='/usr/local/bin/gmake'
-NINJA='/usr/local/bin/ninja'
-PACKAGING_COMMAND='pkg'
-PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl
diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap
libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils
py38-flake8 python3 qemu readline yajl'
-PYPI_PKGS=''
-PYTHON='/usr/local/bin/python3'
diff --git a/ci/manifest.yml b/ci/manifest.yml
index f736ffe539..e789b35ec4 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -189,12 +189,6 @@ targets:
freebsd-13: x86_64
- freebsd-current:
- jobs:
- - arch: x86_64
- allow-failure: true
- builds: False
-
opensuse-leap-152:
jobs:
- arch: x86_64
--
2.35.1
9:09 a.m.
New subject: [libvirt PATCH 1/6] ci: Drop FreeBSD -CURRENT
On Thu, Apr 14, 2022 at 02:33:52PM +0200, Andrea Bolognani wrote:
All build jobs for the target are explicitly disabled, so
there's no point in keeping the variables file around and we
can't simply not mention it in the manifest at all.
s/can't/can/
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/cirrus/freebsd-current.vars | 16 ----------------
ci/manifest.yml | 6 ------
2 files changed, 22 deletions(-)
delete mode 100644 ci/cirrus/freebsd-current.vars
diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars
deleted file mode 100644
index e8b06b32e1..0000000000
--- a/ci/cirrus/freebsd-current.vars
+++ /dev/null
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-CCACHE='/usr/local/bin/ccache'
-CPAN_PKGS=''
-CROSS_PKGS=''
-MAKE='/usr/local/bin/gmake'
-NINJA='/usr/local/bin/ninja'
-PACKAGING_COMMAND='pkg'
-PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl
diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap
libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils
py38-flake8 python3 qemu readline yajl'
-PYPI_PKGS=''
-PYTHON='/usr/local/bin/python3'
diff --git a/ci/manifest.yml b/ci/manifest.yml
index f736ffe539..e789b35ec4 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -189,12 +189,6 @@ targets:
freebsd-13: x86_64
- freebsd-current:
- jobs:
- - arch: x86_64
- allow-failure: true
- builds: False
-
opensuse-leap-152:
jobs:
- arch: x86_64
--
2.35.1
7:33 a.m.
New subject: [libvirt PATCH 2/6] ci: Simplify Alpine Linux 3.14 definition
Using the extended definition format is only necessary when
the defaults are not good enough, but that's not the case here.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/manifest.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/ci/manifest.yml b/ci/manifest.yml
index e789b35ec4..58f6ac36a5 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -18,9 +18,7 @@ targets:
RPM: skip
CC: clang
- alpine-314:
- jobs:
- - arch: x86_64
+ alpine-314: x86_64
alpine-edge:
jobs:
--
2.35.1
7:33 a.m.
New subject: [libvirt PATCH 3/6] ci: Add Alpine Linux 3.15
It was released in November 2021.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/containers/alpine-315.Dockerfile | 80 +++++++++++++++++++++++++++++
ci/gitlab.yml | 16 ++++++
ci/manifest.yml | 2 +
3 files changed, 98 insertions(+)
create mode 100644 ci/containers/alpine-315.Dockerfile
diff --git a/ci/containers/alpine-315.Dockerfile b/ci/containers/alpine-315.Dockerfile
new file mode 100644
index 0000000000..26d72f85a3
--- /dev/null
+++ b/ci/containers/alpine-315.Dockerfile
@@ -0,0 +1,80 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+FROM docker.io/library/alpine:3.15
+
+RUN apk update && \
+ apk upgrade && \
+ apk add \
+ acl-dev \
+ attr-dev \
+ audit-dev \
+ augeas \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ ceph-dev \
+ clang \
+ curl-dev \
+ cyrus-sasl-dev \
+ diffutils \
+ eudev-dev \
+ fuse-dev \
+ gcc \
+ gettext \
+ git \
+ glib-dev \
+ gnutls-dev \
+ grep \
+ iproute2 \
+ iptables \
+ kmod \
+ libcap-ng-dev \
+ libnl3-dev \
+ libpcap-dev \
+ libpciaccess-dev \
+ libselinux-dev \
+ libssh-dev \
+ libssh2-dev \
+ libtirpc-dev \
+ libxml2-dev \
+ libxml2-utils \
+ libxslt \
+ lvm2 \
+ lvm2-dev \
+ make \
+ meson \
+ musl-dev \
+ netcf-dev \
+ nfs-utils \
+ numactl-dev \
+ open-iscsi \
+ parted-dev \
+ perl \
+ pkgconf \
+ polkit \
+ py3-docutils \
+ py3-flake8 \
+ python3 \
+ qemu-img \
+ readline-dev \
+ samurai \
+ sed \
+ util-linux-dev \
+ wireshark-dev \
+ xen-dev \
+ yajl-dev && \
+ apk list | 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 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 af4c61b7b4..dd6f919f2f 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -93,6 +93,13 @@ x86_64-alpine-314-container:
NAME: alpine-314
+x86_64-alpine-315-container:
+ extends: .container_job
+ allow_failure: false
+ variables:
+ NAME: alpine-315
+
+
x86_64-alpine-edge-container:
extends: .container_job
allow_failure: true
@@ -415,6 +422,15 @@ x86_64-alpine-314:
NAME: alpine-314
+x86_64-alpine-315:
+ extends: .native_build_job
+ needs:
+ - x86_64-alpine-315-container
+ allow_failure: false
+ variables:
+ NAME: alpine-315
+
+
x86_64-alpine-edge:
extends: .native_build_job
needs:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 58f6ac36a5..9e29ffefc0 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -20,6 +20,8 @@ targets:
alpine-314: x86_64
+ alpine-315: x86_64
+
alpine-edge:
jobs:
- arch: x86_64
--
2.35.1
7:33 a.m.
New subject: [libvirt PATCH 4/6] ci: Add openSUSE Leap 15.3
It was released in June 2021.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/containers/opensuse-leap-153.Dockerfile | 100 +++++++++++++++++++++
ci/gitlab.yml | 17 ++++
ci/manifest.yml | 6 ++
3 files changed, 123 insertions(+)
create mode 100644 ci/containers/opensuse-leap-153.Dockerfile
diff --git a/ci/containers/opensuse-leap-153.Dockerfile
b/ci/containers/opensuse-leap-153.Dockerfile
new file mode 100644
index 0000000000..583e994716
--- /dev/null
+++ b/ci/containers/opensuse-leap-153.Dockerfile
@@ -0,0 +1,100 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+FROM registry.opensuse.org/opensuse/leap:15.3
+
+RUN zypper update -y && \
+ zypper install -y \
+ audit-devel \
+ augeas \
+ augeas-lenses \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ codespell \
+ cpp \
+ cppi \
+ cyrus-sasl-devel \
+ device-mapper-devel \
+ diffutils \
+ dwarves \
+ ebtables \
+ fuse-devel \
+ gcc \
+ gettext-runtime \
+ git \
+ glib2-devel \
+ glibc-devel \
+ glibc-locale \
+ glusterfs-devel \
+ grep \
+ iproute2 \
+ iptables \
+ kmod \
+ libacl-devel \
+ libapparmor-devel \
+ libattr-devel \
+ libblkid-devel \
+ libcap-ng-devel \
+ libcurl-devel \
+ libgnutls-devel \
+ libiscsi-devel \
+ libnl3-devel \
+ libnuma-devel \
+ libpcap-devel \
+ libpciaccess-devel \
+ librbd-devel \
+ libselinux-devel \
+ libssh-devel \
+ libssh2-devel \
+ libtirpc-devel \
+ libudev-devel \
+ libwsman-devel \
+ libxml2 \
+ libxml2-devel \
+ libxslt \
+ libyajl-devel \
+ lvm2 \
+ make \
+ nfs-utils \
+ ninja \
+ numad \
+ open-iscsi \
+ parted-devel \
+ perl-base \
+ pkgconfig \
+ polkit \
+ python3-base \
+ python3-docutils \
+ python3-flake8 \
+ python3-pip \
+ python3-setuptools \
+ python3-wheel \
+ qemu-tools \
+ readline-devel \
+ rpcgen \
+ rpm-build \
+ sanlock-devel \
+ scrub \
+ sed \
+ systemtap-sdt-devel \
+ wireshark-devel \
+ xen-devel && \
+ zypper clean --all && \
+ 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
+
+RUN pip3 install meson==0.56.0
+
+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 dd6f919f2f..4fd929f244 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -170,6 +170,13 @@ x86_64-opensuse-leap-152-container:
NAME: opensuse-leap-152
+x86_64-opensuse-leap-153-container:
+ extends: .container_job
+ allow_failure: false
+ variables:
+ NAME: opensuse-leap-153
+
+
x86_64-opensuse-tumbleweed-container:
extends: .container_job
allow_failure: true
@@ -558,6 +565,16 @@ x86_64-opensuse-leap-152:
RPM: skip
+x86_64-opensuse-leap-153:
+ extends: .native_build_job
+ needs:
+ - x86_64-opensuse-leap-153-container
+ allow_failure: false
+ variables:
+ NAME: opensuse-leap-153
+ RPM: skip
+
+
x86_64-opensuse-tumbleweed:
extends: .native_build_job
needs:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 9e29ffefc0..2d96b58e6d 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -195,6 +195,12 @@ targets:
variables:
RPM: skip
+ opensuse-leap-153:
+ jobs:
+ - arch: x86_64
+ variables:
+ RPM: skip
+
opensuse-tumbleweed:
jobs:
- arch: x86_64
--
2.35.1
7:33 a.m.
New subject: [libvirt PATCH 5/6] ci: Move codestyle job to openSUSE Leap 15.3
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b4c843055..0fbdd82aae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,9 +80,9 @@ website:
codestyle:
stage: sanity_checks
- image: $CI_REGISTRY_IMAGE/ci-opensuse-leap-152:latest
+ image: $CI_REGISTRY_IMAGE/ci-opensuse-leap-153:latest
needs:
- - x86_64-opensuse-leap-152-container
+ - x86_64-opensuse-leap-153-container
before_script:
- *script_variables
script:
--
2.35.1
7:33 a.m.
New subject: [libvirt PATCH 6/6] ci: Drop openSUSE Leap 15.2
It has reached end of life in January 2022.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/containers/opensuse-leap-152.Dockerfile | 100 ---------------------
ci/gitlab.yml | 17 ----
ci/manifest.yml | 6 --
3 files changed, 123 deletions(-)
delete mode 100644 ci/containers/opensuse-leap-152.Dockerfile
diff --git a/ci/containers/opensuse-leap-152.Dockerfile
b/ci/containers/opensuse-leap-152.Dockerfile
deleted file mode 100644
index 19161f60cf..0000000000
--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ /dev/null
@@ -1,100 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.opensuse.org/opensuse/leap:15.2
-
-RUN zypper update -y && \
- zypper install -y \
- audit-devel \
- augeas \
- augeas-lenses \
- bash-completion \
- ca-certificates \
- ccache \
- clang \
- codespell \
- cpp \
- cppi \
- cyrus-sasl-devel \
- device-mapper-devel \
- diffutils \
- dwarves \
- ebtables \
- fuse-devel \
- gcc \
- gettext-runtime \
- git \
- glib2-devel \
- glibc-devel \
- glibc-locale \
- glusterfs-devel \
- grep \
- iproute2 \
- iptables \
- kmod \
- libacl-devel \
- libapparmor-devel \
- libattr-devel \
- libblkid-devel \
- libcap-ng-devel \
- libcurl-devel \
- libgnutls-devel \
- libiscsi-devel \
- libnl3-devel \
- libnuma-devel \
- libpcap-devel \
- libpciaccess-devel \
- librbd-devel \
- libselinux-devel \
- libssh-devel \
- libssh2-devel \
- libtirpc-devel \
- libudev-devel \
- libwsman-devel \
- libxml2 \
- libxml2-devel \
- libxslt \
- libyajl-devel \
- lvm2 \
- make \
- nfs-utils \
- ninja \
- numad \
- open-iscsi \
- parted-devel \
- perl-base \
- pkgconfig \
- polkit \
- python3-base \
- python3-docutils \
- python3-flake8 \
- python3-pip \
- python3-setuptools \
- python3-wheel \
- qemu-tools \
- readline-devel \
- rpcgen \
- rpm-build \
- sanlock-devel \
- scrub \
- sed \
- systemtap-sdt-devel \
- wireshark-devel \
- xen-devel && \
- zypper clean --all && \
- 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
-
-RUN pip3 install meson==0.56.0
-
-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 4fd929f244..e2247d0f02 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -163,13 +163,6 @@ x86_64-fedora-rawhide-container:
NAME: fedora-rawhide
-x86_64-opensuse-leap-152-container:
- extends: .container_job
- allow_failure: false
- variables:
- NAME: opensuse-leap-152
-
-
x86_64-opensuse-leap-153-container:
extends: .container_job
allow_failure: false
@@ -555,16 +548,6 @@ x86_64-fedora-rawhide-clang:
RPM: skip
-x86_64-opensuse-leap-152:
- extends: .native_build_job
- needs:
- - x86_64-opensuse-leap-152-container
- allow_failure: false
- variables:
- NAME: opensuse-leap-152
- RPM: skip
-
-
x86_64-opensuse-leap-153:
extends: .native_build_job
needs:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 2d96b58e6d..e221cd54f3 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -189,12 +189,6 @@ targets:
freebsd-13: x86_64
- opensuse-leap-152:
- jobs:
- - arch: x86_64
- variables:
- RPM: skip
-
opensuse-leap-153:
jobs:
- arch: x86_64
--
2.35.1
9:09 a.m.
On Thu, Apr 14, 2022 at 02:33:51PM +0200, Andrea Bolognani wrote:
Test pipeline:
https://gitlab.com/abologna/libvirt/-/pipelines/516876671
Andrea Bolognani (6):
ci: Drop FreeBSD -CURRENT
ci: Simplify Alpine Linux 3.14 definition
ci: Add Alpine Linux 3.15
ci: Add openSUSE Leap 15.3
ci: Move codestyle job to openSUSE Leap 15.3
ci: Drop openSUSE Leap 15.2
Reviewed-by: Martin Kletzander <mkletzan(a)redhat.com>
.gitlab-ci.yml | 4 +-
ci/cirrus/freebsd-current.vars | 16 ----
ci/containers/alpine-315.Dockerfile | 80 +++++++++++++++++++
...ockerfile => opensuse-leap-153.Dockerfile} | 2 +-
ci/gitlab.yml | 26 ++++--
ci/manifest.yml | 14 +---
6 files changed, 108 insertions(+), 34 deletions(-)
delete mode 100644 ci/cirrus/freebsd-current.vars
create mode 100644 ci/containers/alpine-315.Dockerfile
rename ci/containers/{opensuse-leap-152.Dockerfile => opensuse-leap-153.Dockerfile}
(98%)
--
2.35.1
955
days inactive
955
days old
8 comments
2 participants
participants (2)
-
Andrea Bolognani -
Martin Kletzander