5:04 a.m.
This brings our pipeline in sync with the current status of the
libvirt-ci repository.
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/296773363
Andrea Bolognani (8):
ci: Remove Fedora Rawhide dwarf4 hack
ci: Rename CentOS Stream 8 and openSUSE Leap 15.2 containers
ci: Refresh contents
ci: Add openSUSE Tumbleweed
ci: Add FreeBSD 13
ci: Add Fedora 34
ci: Drop Fedora 32
ci: Drop CentOS 7
.gitlab-ci.yml | 88 +++++------
ci/cirrus/freebsd-12.vars | 2 +-
.../{freebsd-12.vars =3D> freebsd-13.vars} | 4 +-
ci/cirrus/freebsd-current.vars | 2 +-
ci/cirrus/macos-11.vars | 2 +-
ci/containers/centos-7.Dockerfile | 138 ------------------
ci/containers/centos-8.Dockerfile | 2 +-
....Dockerfile =3D> centos-stream-8.Dockerfile} | 10 +-
.../debian-10-cross-aarch64.Dockerfile | 4 +-
.../debian-10-cross-armv6l.Dockerfile | 4 +-
.../debian-10-cross-armv7l.Dockerfile | 4 +-
ci/containers/debian-10-cross-i686.Dockerfile | 4 +-
ci/containers/debian-10-cross-mips.Dockerfile | 4 +-
.../debian-10-cross-mips64el.Dockerfile | 4 +-
.../debian-10-cross-mipsel.Dockerfile | 4 +-
.../debian-10-cross-ppc64le.Dockerfile | 4 +-
.../debian-10-cross-s390x.Dockerfile | 4 +-
ci/containers/debian-10.Dockerfile | 4 +-
.../debian-sid-cross-aarch64.Dockerfile | 4 +-
.../debian-sid-cross-armv6l.Dockerfile | 4 +-
.../debian-sid-cross-armv7l.Dockerfile | 4 +-
.../debian-sid-cross-i686.Dockerfile | 4 +-
.../debian-sid-cross-mips64el.Dockerfile | 4 +-
.../debian-sid-cross-mipsel.Dockerfile | 4 +-
.../debian-sid-cross-ppc64le.Dockerfile | 4 +-
.../debian-sid-cross-s390x.Dockerfile | 4 +-
ci/containers/debian-sid.Dockerfile | 4 +-
ci/containers/fedora-33.Dockerfile | 4 +-
...ora-32.Dockerfile =3D> fedora-34.Dockerfile} | 8 +-
.../fedora-rawhide-cross-mingw32.Dockerfile | 4 +-
.../fedora-rawhide-cross-mingw64.Dockerfile | 4 +-
ci/containers/fedora-rawhide.Dockerfile | 4 +-
...ockerfile =3D> opensuse-leap-152.Dockerfile} | 6 +-
...kerfile =3D> opensuse-tumbleweed.Dockerfile} | 15 +-
ci/containers/ubuntu-1804.Dockerfile | 4 +-
ci/containers/ubuntu-2004.Dockerfile | 4 +-
36 files changed, 117 insertions(+), 260 deletions(-)
copy ci/cirrus/{freebsd-12.vars =3D> freebsd-13.vars} (79%)
delete mode 100644 ci/containers/centos-7.Dockerfile
rename ci/containers/{centos-stream.Dockerfile =3D> centos-stream-8.Dockerfi=
le} (89%)
rename ci/containers/{fedora-32.Dockerfile =3D> fedora-34.Dockerfile} (93%)
copy ci/containers/{opensuse-152.Dockerfile =3D> opensuse-leap-152.Dockerfil=
e} (94%)
rename ci/containers/{opensuse-152.Dockerfile =3D> opensuse-tumbleweed.Docke=
rfile} (88%)
--=20
2.26.3
5:04 a.m.
New subject: [libvirt PATCH 1/8] ci: Remove Fedora Rawhide dwarf4 hack
It's no longer needed.
Reverts: e603efb6ec5d1a2295adfda934e79f022bb7bb0e
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b7df68f47..d2f541efbc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -368,10 +368,6 @@ x64-fedora-rawhide:
- x64-fedora-rawhide-container
variables:
NAME: fedora-rawhide
- # Temp workaround until we see what resolution is for
- # https://bugzilla.redhat.com/show_bug.cgi?id=1919965
- # Hopefully remove before F34 is released.
- CFLAGS: -gdwarf-4
x64-fedora-rawhide-clang:
extends: .native_build_job
--
2.26.3
5:04 a.m.
New subject: [libvirt PATCH 2/8] ci: Rename CentOS Stream 8 and openSUSE Leap 15.2 containers
The names have been recently changed in libvirt-ci to be more
accurate, so we should follow along.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 24 +++++++++----------
....Dockerfile => centos-stream-8.Dockerfile} | 0
...ockerfile => opensuse-leap-152.Dockerfile} | 0
3 files changed, 12 insertions(+), 12 deletions(-)
rename ci/containers/{centos-stream.Dockerfile => centos-stream-8.Dockerfile} (100%)
rename ci/containers/{opensuse-152.Dockerfile => opensuse-leap-152.Dockerfile} (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2f541efbc..68e71c842b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,10 +143,10 @@ x64-centos-8-container:
variables:
NAME: centos-8
-x64-centos-stream-container:
+x64-centos-stream-8-container:
extends: .container_job
variables:
- NAME: centos-stream
+ NAME: centos-stream-8
x64-debian-10-container:
extends: .container_job
@@ -173,10 +173,10 @@ x64-fedora-rawhide-container:
variables:
NAME: fedora-rawhide
-x64-opensuse-152-container:
+x64-opensuse-leap-152-container:
extends: .container_job
variables:
- NAME: opensuse-152
+ NAME: opensuse-leap-152
x64-ubuntu-1804-container:
extends: .container_job
@@ -339,12 +339,12 @@ x64-centos-8-clang:
CC: clang
RPM: skip
-x64-centos-stream:
+x64-centos-stream-8:
extends: .native_build_job
needs:
- - x64-centos-stream-container
+ - x64-centos-stream-8-container
variables:
- NAME: centos-stream
+ NAME: centos-stream-8
RPM: skip
x64-fedora-32:
@@ -378,12 +378,12 @@ x64-fedora-rawhide-clang:
CC: clang
RPM: skip
-x64-opensuse-152:
+x64-opensuse-leap-152:
extends: .native_build_job
needs:
- - x64-opensuse-152-container
+ - x64-opensuse-leap-152-container
variables:
- NAME: opensuse-152
+ NAME: opensuse-leap-152
RPM: skip
x64-ubuntu-1804:
@@ -539,9 +539,9 @@ website:
codestyle:
stage: builds
- image: $CI_REGISTRY_IMAGE/ci-opensuse-152:latest
+ image: $CI_REGISTRY_IMAGE/ci-opensuse-leap-152:latest
needs:
- - x64-opensuse-152-container
+ - x64-opensuse-leap-152-container
before_script:
- *script_variables
script:
diff --git a/ci/containers/centos-stream.Dockerfile
b/ci/containers/centos-stream-8.Dockerfile
similarity index 100%
rename from ci/containers/centos-stream.Dockerfile
rename to ci/containers/centos-stream-8.Dockerfile
diff --git a/ci/containers/opensuse-152.Dockerfile
b/ci/containers/opensuse-leap-152.Dockerfile
similarity index 100%
rename from ci/containers/opensuse-152.Dockerfile
rename to ci/containers/opensuse-leap-152.Dockerfile
--
2.26.3
5:04 a.m.
New subject: [libvirt PATCH 3/8] ci: Refresh contents
Notable changes:
* the CentOS Stream 8 container is now using a proper base
image instead of starting from a CentOS 8 image and then
adding the CentOS Stream 8 repositories on top;
* distributions that have a perl-base package are now using
that one instead of the regular perl package, which
contains a bunch of features we don't need, resulting in
smaller containers.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/cirrus/freebsd-12.vars | 2 +-
ci/cirrus/freebsd-current.vars | 2 +-
ci/cirrus/macos-11.vars | 2 +-
ci/containers/centos-8.Dockerfile | 2 +-
ci/containers/centos-stream-8.Dockerfile | 10 ++++------
ci/containers/debian-10-cross-aarch64.Dockerfile | 4 ++--
ci/containers/debian-10-cross-armv6l.Dockerfile | 4 ++--
ci/containers/debian-10-cross-armv7l.Dockerfile | 4 ++--
ci/containers/debian-10-cross-i686.Dockerfile | 4 ++--
ci/containers/debian-10-cross-mips.Dockerfile | 4 ++--
ci/containers/debian-10-cross-mips64el.Dockerfile | 4 ++--
ci/containers/debian-10-cross-mipsel.Dockerfile | 4 ++--
ci/containers/debian-10-cross-ppc64le.Dockerfile | 4 ++--
ci/containers/debian-10-cross-s390x.Dockerfile | 4 ++--
ci/containers/debian-10.Dockerfile | 4 ++--
ci/containers/debian-sid-cross-aarch64.Dockerfile | 4 ++--
ci/containers/debian-sid-cross-armv6l.Dockerfile | 4 ++--
ci/containers/debian-sid-cross-armv7l.Dockerfile | 4 ++--
ci/containers/debian-sid-cross-i686.Dockerfile | 4 ++--
ci/containers/debian-sid-cross-mips64el.Dockerfile | 4 ++--
ci/containers/debian-sid-cross-mipsel.Dockerfile | 4 ++--
ci/containers/debian-sid-cross-ppc64le.Dockerfile | 4 ++--
ci/containers/debian-sid-cross-s390x.Dockerfile | 4 ++--
ci/containers/debian-sid.Dockerfile | 4 ++--
ci/containers/fedora-33.Dockerfile | 4 ++--
ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 4 ++--
ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 4 ++--
ci/containers/fedora-rawhide.Dockerfile | 4 ++--
ci/containers/opensuse-leap-152.Dockerfile | 6 +++---
ci/containers/ubuntu-1804.Dockerfile | 4 ++--
ci/containers/ubuntu-2004.Dockerfile | 4 ++--
31 files changed, 61 insertions(+), 63 deletions(-)
diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index 7bd875176e..40a19b5773 100644
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@@ -2,7 +2,7 @@
#
# $ lcitool variables freebsd-12 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
PACKAGING_COMMAND='pkg'
CCACHE='/usr/local/bin/ccache'
diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars
index 0f5b704a7b..e4de22b302 100644
--- a/ci/cirrus/freebsd-current.vars
+++ b/ci/cirrus/freebsd-current.vars
@@ -2,7 +2,7 @@
#
# $ lcitool variables freebsd-current libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
PACKAGING_COMMAND='pkg'
CCACHE='/usr/local/bin/ccache'
diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars
index 8965338456..a723cdf927 100644
--- a/ci/cirrus/macos-11.vars
+++ b/ci/cirrus/macos-11.vars
@@ -2,7 +2,7 @@
#
# $ lcitool variables macos-11 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
PACKAGING_COMMAND='brew'
CCACHE='/usr/local/bin/ccache'
diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile
index 0c7292b8d2..9358e69b0c 100644
--- a/ci/containers/centos-8.Dockerfile
+++ b/ci/containers/centos-8.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile centos-8 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/centos:8
diff --git a/ci/containers/centos-stream-8.Dockerfile
b/ci/containers/centos-stream-8.Dockerfile
index 3bc66775eb..3355374e67 100644
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -1,14 +1,12 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile centos-stream libvirt
+# $ lcitool dockerfile centos-stream-8 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
-FROM docker.io/library/centos:8
+FROM quay.io/centos/centos:stream8
-RUN dnf install -y centos-release-stream && \
- dnf install -y centos-stream-release && \
- dnf update -y && \
+RUN dnf update -y && \
dnf install 'dnf-command(config-manager)' -y && \
dnf config-manager --set-enabled -y powertools && \
dnf install -y centos-release-advanced-virtualization && \
diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile
b/ci/containers/debian-10-cross-aarch64.Dockerfile
index e006dcc68b..7d10b93d06 100644
--- a/ci/containers/debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-10-cross-aarch64.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross aarch64 debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:10-slim
@@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile
b/ci/containers/debian-10-cross-armv6l.Dockerfile
index abc3ef52db..25057ea993 100644
--- a/ci/containers/debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv6l.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross armv6l debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:10-slim
@@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile
b/ci/containers/debian-10-cross-armv7l.Dockerfile
index 2e9bedf614..ef880ac0fe 100644
--- a/ci/containers/debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv7l.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross armv7l debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:10-slim
@@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-10-cross-i686.Dockerfile
b/ci/containers/debian-10-cross-i686.Dockerfile
index 4b88d751bd..5826866c2d 100644
--- a/ci/containers/debian-10-cross-i686.Dockerfile
+++ b/ci/containers/debian-10-cross-i686.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross i686 debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:10-slim
@@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-10-cross-mips.Dockerfile
b/ci/containers/debian-10-cross-mips.Dockerfile
index dbdc9c57a8..aaa2df47a8 100644
--- a/ci/containers/debian-10-cross-mips.Dockerfile
+++ b/ci/containers/debian-10-cross-mips.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mips debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:10-slim
@@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile
b/ci/containers/debian-10-cross-mips64el.Dockerfile
index 37044e296d..d3f25791a3 100644
--- a/ci/containers/debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-10-cross-mips64el.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mips64el debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:10-slim
@@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile
b/ci/containers/debian-10-cross-mipsel.Dockerfile
index 3587f52374..cc9142aa72 100644
--- a/ci/containers/debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-10-cross-mipsel.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mipsel debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:10-slim
@@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile
b/ci/containers/debian-10-cross-ppc64le.Dockerfile
index e8699d896b..ce68bbb19f 100644
--- a/ci/containers/debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross ppc64le debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:10-slim
@@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile
b/ci/containers/debian-10-cross-s390x.Dockerfile
index b31b5fd051..773f04933f 100644
--- a/ci/containers/debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/debian-10-cross-s390x.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross s390x debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:10-slim
@@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
index d4ab8196c2..119a77bb09 100644
--- a/ci/containers/debian-10.Dockerfile
+++ b/ci/containers/debian-10.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile debian-10 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:10-slim
@@ -75,7 +75,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile
b/ci/containers/debian-sid-cross-aarch64.Dockerfile
index 514f42a83e..736414b179 100644
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross aarch64 debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:sid-slim
@@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile
b/ci/containers/debian-sid-cross-armv6l.Dockerfile
index 592c485f64..b4304a7f32 100644
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross armv6l debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:sid-slim
@@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile
b/ci/containers/debian-sid-cross-armv7l.Dockerfile
index f4e9829961..e4db402bc9 100644
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross armv7l debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:sid-slim
@@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile
b/ci/containers/debian-sid-cross-i686.Dockerfile
index 500e306f8b..983cd2a336 100644
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross i686 debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:sid-slim
@@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile
b/ci/containers/debian-sid-cross-mips64el.Dockerfile
index 1ed444d9d3..e568b46d60 100644
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mips64el debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:sid-slim
@@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile
b/ci/containers/debian-sid-cross-mipsel.Dockerfile
index e30e1cf808..cf24c09244 100644
--- a/ci/containers/debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mipsel debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:sid-slim
@@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
index 430cd1176c..40be4130af 100644
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross ppc64le debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:sid-slim
@@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile
b/ci/containers/debian-sid-cross-s390x.Dockerfile
index 716002dbaa..e0b7dff94a 100644
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross s390x debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:sid-slim
@@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
index 011b766715..454d726465 100644
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile debian-sid libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/debian:sid-slim
@@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile
index 2885eafbb0..aed94d1256 100644
--- a/ci/containers/fedora-33.Dockerfile
+++ b/ci/containers/fedora-33.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile fedora-33 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM registry.fedoraproject.org/fedora:33
@@ -79,7 +79,7 @@ exec "$@"' > /usr/bin/nosync && \
numad \
parted \
parted-devel \
- perl \
+ perl-base \
pkgconfig \
polkit \
python3 \
diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
index 139e0b145c..93a57b3277 100644
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM registry.fedoraproject.org/fedora:rawhide
@@ -47,7 +47,7 @@ exec "$@"' > /usr/bin/nosync && \
ninja-build \
numad \
parted \
- perl \
+ perl-base \
polkit \
python3 \
python3-docutils \
diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
index b24049f879..ed16d75479 100644
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM registry.fedoraproject.org/fedora:rawhide
@@ -47,7 +47,7 @@ exec "$@"' > /usr/bin/nosync && \
ninja-build \
numad \
parted \
- perl \
+ perl-base \
polkit \
python3 \
python3-docutils \
diff --git a/ci/containers/fedora-rawhide.Dockerfile
b/ci/containers/fedora-rawhide.Dockerfile
index 1f0abb7288..79bacbcc95 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile fedora-rawhide libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM registry.fedoraproject.org/fedora:rawhide
@@ -80,7 +80,7 @@ exec "$@"' > /usr/bin/nosync && \
numad \
parted \
parted-devel \
- perl \
+ perl-base \
pkgconfig \
polkit \
python3 \
diff --git a/ci/containers/opensuse-leap-152.Dockerfile
b/ci/containers/opensuse-leap-152.Dockerfile
index 6b56641292..b5f7e5f54e 100644
--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@@ -1,8 +1,8 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile opensuse-152 libvirt
+# $ lcitool dockerfile opensuse-leap-152 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM registry.opensuse.org/opensuse/leap:15.2
@@ -68,7 +68,7 @@ RUN zypper update -y && \
open-iscsi \
parted \
parted-devel \
- perl \
+ perl-base \
pkgconfig \
polkit \
python3-base \
diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile
index c6c3ef5823..5e4a2e0b8f 100644
--- a/ci/containers/ubuntu-1804.Dockerfile
+++ b/ci/containers/ubuntu-1804.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile ubuntu-1804 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/ubuntu:18.04
@@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index 78df341dca..0e2790f03f 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile ubuntu-2004 libvirt
#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
FROM docker.io/library/ubuntu:20.04
@@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
numad \
open-iscsi \
parted \
- perl \
+ perl-base \
pkgconf \
policykit-1 \
python3 \
--
2.26.3
5:04 a.m.
New subject: [libvirt PATCH 4/8] ci: Add openSUSE Tumbleweed
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 13 +++
ci/containers/opensuse-tumbleweed.Dockerfile | 101 +++++++++++++++++++
2 files changed, 114 insertions(+)
create mode 100644 ci/containers/opensuse-tumbleweed.Dockerfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68e71c842b..84032ab412 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -178,6 +178,11 @@ x64-opensuse-leap-152-container:
variables:
NAME: opensuse-leap-152
+x64-opensuse-tumbleweed-container:
+ extends: .container_job
+ variables:
+ NAME: opensuse-tumbleweed
+
x64-ubuntu-1804-container:
extends: .container_job
variables:
@@ -386,6 +391,14 @@ x64-opensuse-leap-152:
NAME: opensuse-leap-152
RPM: skip
+x64-opensuse-tumbleweed:
+ extends: .native_build_job
+ needs:
+ - x64-opensuse-tumbleweed-container
+ variables:
+ NAME: opensuse-tumbleweed
+ RPM: skip
+
x64-ubuntu-1804:
extends: .native_build_job
needs:
diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile
b/ci/containers/opensuse-tumbleweed.Dockerfile
new file mode 100644
index 0000000000..9f49fdabfd
--- /dev/null
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -0,0 +1,101 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile opensuse-tumbleweed libvirt
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
+
+FROM registry.opensuse.org/opensuse/tumbleweed:latest
+
+RUN zypper update -y && \
+ zypper install -y \
+ audit-devel \
+ augeas \
+ augeas-lenses \
+ avahi-devel \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ cpp \
+ cppi \
+ cyrus-sasl-devel \
+ dbus-1-devel \
+ device-mapper-devel \
+ diffutils \
+ dnsmasq \
+ 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 \
+ meson \
+ nfs-utils \
+ ninja \
+ numad \
+ open-iscsi \
+ parted \
+ parted-devel \
+ perl-base \
+ pkgconfig \
+ polkit \
+ python3-base \
+ python3-docutils \
+ python3-flake8 \
+ qemu-tools \
+ radvd \
+ readline-devel \
+ rpcgen \
+ rpm-build \
+ sanlock-devel \
+ scrub \
+ sed \
+ systemtap-sdt-devel \
+ wireshark-devel \
+ xen-devel \
+ xfsprogs-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
+
+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"
--
2.26.3
5:04 a.m.
New subject: [libvirt PATCH 5/8] ci: Add FreeBSD 13
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 10 ++++++++++
ci/cirrus/freebsd-13.vars | 13 +++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 ci/cirrus/freebsd-13.vars
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84032ab412..6fd147ae81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -423,6 +423,16 @@ x64-freebsd-12-build:
UPDATE_COMMAND: pkg update
INSTALL_COMMAND: pkg install -y
+x64-freebsd-13-build:
+ extends: .cirrus_build_job
+ variables:
+ NAME: freebsd-13
+ CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
+ CIRRUS_VM_IMAGE_SELECTOR: image_family
+ CIRRUS_VM_IMAGE_NAME: freebsd-13-0
+ UPDATE_COMMAND: pkg update
+ INSTALL_COMMAND: pkg install -y
+
x64-macos-11-build:
extends: .cirrus_build_job
variables:
diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars
new file mode 100644
index 0000000000..f0270c70a4
--- /dev/null
+++ b/ci/cirrus/freebsd-13.vars
@@ -0,0 +1,13 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool variables freebsd-13 libvirt
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
+
+PACKAGING_COMMAND='pkg'
+CCACHE='/usr/local/bin/ccache'
+MAKE='/usr/local/bin/gmake'
+NINJA='/usr/local/bin/ninja'
+PYTHON='/usr/local/bin/python3'
+PIP3='/usr/local/bin/pip-3.7'
+PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus
diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap
libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils
py37-flake8 python3 qemu radvd readline yajl'
--
2.26.3
5:04 a.m.
New subject: [libvirt PATCH 6/8] ci: Add Fedora 34
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 12 +++
ci/containers/fedora-34.Dockerfile | 115 +++++++++++++++++++++++++++++
2 files changed, 127 insertions(+)
create mode 100644 ci/containers/fedora-34.Dockerfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fd147ae81..069f625b19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -168,6 +168,11 @@ x64-fedora-33-container:
variables:
NAME: fedora-33
+x64-fedora-34-container:
+ extends: .container_job
+ variables:
+ NAME: fedora-34
+
x64-fedora-rawhide-container:
extends: .container_job
variables:
@@ -367,6 +372,13 @@ x64-fedora-33:
variables:
NAME: fedora-33
+x64-fedora-34:
+ extends: .native_build_job
+ needs:
+ - x64-fedora-34-container
+ variables:
+ NAME: fedora-34
+
x64-fedora-rawhide:
extends: .native_build_job
needs:
diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile
new file mode 100644
index 0000000000..53a5d67b3f
--- /dev/null
+++ b/ci/containers/fedora-34.Dockerfile
@@ -0,0 +1,115 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile fedora-34 libvirt
+#
+#
https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a...
+
+FROM registry.fedoraproject.org/fedora:34
+
+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 \
+ audit-libs-devel \
+ augeas \
+ avahi-devel \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ cpp \
+ cppi \
+ cyrus-sasl-devel \
+ dbus-devel \
+ device-mapper-devel \
+ diffutils \
+ dnsmasq \
+ 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 \
+ libudev-devel \
+ libwsman-devel \
+ libxml2 \
+ libxml2-devel \
+ libxslt \
+ lvm2 \
+ make \
+ meson \
+ netcf-devel \
+ nfs-utils \
+ ninja-build \
+ numactl-devel \
+ numad \
+ parted \
+ parted-devel \
+ perl-base \
+ pkgconfig \
+ polkit \
+ python3 \
+ python3-docutils \
+ python3-flake8 \
+ qemu-img \
+ radvd \
+ readline-devel \
+ rpcgen \
+ rpm-build \
+ sanlock-devel \
+ scrub \
+ sed \
+ sheepdog \
+ systemtap-sdt-devel \
+ wireshark-devel \
+ xen-devel \
+ xfsprogs-devel \
+ yajl-devel \
+ zfs-fuse && \
+ 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 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"
--
2.26.3
5:04 a.m.
New subject: [libvirt PATCH 7/8] ci: Drop Fedora 32
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 13 ----
ci/containers/fedora-32.Dockerfile | 115 -----------------------------
2 files changed, 128 deletions(-)
delete mode 100644 ci/containers/fedora-32.Dockerfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 069f625b19..a7d2b30ab5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -158,11 +158,6 @@ x64-debian-sid-container:
variables:
NAME: debian-sid
-x64-fedora-32-container:
- extends: .container_job
- variables:
- NAME: fedora-32
-
x64-fedora-33-container:
extends: .container_job
variables:
@@ -357,14 +352,6 @@ x64-centos-stream-8:
NAME: centos-stream-8
RPM: skip
-x64-fedora-32:
- extends: .native_build_job
- needs:
- - x64-fedora-32-container
- variables:
- NAME: fedora-32
- RPM: skip
-
x64-fedora-33:
extends: .native_build_job
needs:
diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile
deleted file mode 100644
index 9b06bcbac5..0000000000
--- a/ci/containers/fedora-32.Dockerfile
+++ /dev/null
@@ -1,115 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile fedora-32 libvirt
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
-
-FROM registry.fedoraproject.org/fedora:32
-
-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 \
- audit-libs-devel \
- augeas \
- avahi-devel \
- bash-completion \
- ca-certificates \
- ccache \
- clang \
- cpp \
- cppi \
- cyrus-sasl-devel \
- dbus-devel \
- device-mapper-devel \
- diffutils \
- dnsmasq \
- 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 \
- libudev-devel \
- libwsman-devel \
- libxml2 \
- libxml2-devel \
- libxslt \
- lvm2 \
- make \
- meson \
- netcf-devel \
- nfs-utils \
- ninja-build \
- numactl-devel \
- numad \
- parted \
- parted-devel \
- perl \
- pkgconfig \
- polkit \
- python3 \
- python3-docutils \
- python3-flake8 \
- qemu-img \
- radvd \
- readline-devel \
- rpcgen \
- rpm-build \
- sanlock-devel \
- scrub \
- sed \
- sheepdog \
- systemtap-sdt-devel \
- wireshark-devel \
- xen-devel \
- xfsprogs-devel \
- yajl-devel \
- zfs-fuse && \
- 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 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"
--
2.26.3
5:05 a.m.
New subject: [libvirt PATCH 8/8] ci: Drop CentOS 7
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 16 ----
ci/containers/centos-7.Dockerfile | 138 ------------------------------
2 files changed, 154 deletions(-)
delete mode 100644 ci/containers/centos-7.Dockerfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7d2b30ab5..35ec626113 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,11 +133,6 @@ stages:
# Native container build jobs
-x64-centos-7-container:
- extends: .container_job
- variables:
- NAME: centos-7
-
x64-centos-8-container:
extends: .container_job
variables:
@@ -316,17 +311,6 @@ x64-debian-sid:
variables:
NAME: debian-sid
-x64-centos-7:
- extends: .native_build_job
- needs:
- - x64-centos-7-container
- variables:
- NAME: centos-7
- # meson dist fails on CentOS 7 because of old git that fails to clone
- # from shallow git repository which is done when running meson dist
- DIST: skip
- RPM: skip
-
x64-centos-8:
extends: .native_build_job
needs:
diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile
deleted file mode 100644
index 49345fa128..0000000000
--- a/ci/containers/centos-7.Dockerfile
+++ /dev/null
@@ -1,138 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile centos-7 libvirt
-#
-#
https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e...
-
-FROM docker.io/library/centos:7
-
-RUN yum update -y && \
- echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
- echo -e '[openvz]\n\
-name=OpenVZ addons\n\
-baseurl=https://download.openvz.org/virtuozzo/releases/openvz-7.0.11-235/x86_64/os/\n\
-enabled=1\n\
-gpgcheck=1\n\
-skip_if_unavailable=0\n\
-metadata_expire=6h\n\
-priority=90\n\
-includepkgs=libprl*' > /etc/yum.repos.d/openvz.repo && \
- echo -e '-----BEGIN PGP PUBLIC KEY BLOCK-----\n\
-Version: GnuPG v2.0.22 (GNU/Linux)\n\
-\n\
-mI0EVl80nQEEAKrEeyeTCwrzS9kYedZ/sAc/GUqlb81C7pA9SaR3fyck5mVw1Ogk\n\
-YdmNBPM2kY7QDxR9F0EpSpnxSCAXZXugsQ8KzZ0DRLVeBDQyGs9IGK5hI0zzxIil\n\
-BzfvIexLiQQhLy7YlIi8Jt/uUqKkW0pIMNMGcduY97VATtczpncpkmSzABEBAAG0\n\
-SFZpcnR1b3p6byBUZWFtIChHUEcga2V5IHNpZ25hdHVyZSBmb3IgcGFja2FnZXMp\n\
-IDxzZWN1cml0eUB2aXJ0dW96em8uY29tPoi5BBMBAgAjBQJWXzSdAhsDBwsJCAcD\n\
-AgEGFQgCCQoLBBYCAwECHgECF4AACgkQygt9GUTNrSruIgP/er70Eyo73A1gfrjv\n\
-oPUkyo4rslVRZu3qqCwoMFtJc/Z/UxWgEka1buorlcGLa6eO/EZ49c0n+KGa4Kvt\n\
-EUboIq0yEu5i0FyAj92ifm+hNhoAbGfm0cZ4/fD0oGr3l8OsQo4+iHX4xAPwFe7Y\n\
-zABuB8I1ZDZ4OIp5tDfTTuF2LT24jQRWXzSdAQQAog2Aqb+Ptl68O7cQhWLjVGkj\n\
-yyigZrdeReLx3HloKJPBeQ/kA6uvMJc/IYS3uppMWXv9v+QenS6uhP1TUJ2k9FvM\n\
-t94MQZfALN7Vpf8AF+UeWu4Ru+y4BNzcFhrPhIFNFChOR2QqW6FkgE57D9I177NC\n\
-oJMyrlNe8wcGa178An8AEQEAAYifBBgBAgAJBQJWXzSdAhsMAAoJEMoLfRlEza0q\n\
-bKwD/3+OFVIEXnIv5XgdGRNX5fHggsUN1bb8gva7HANRlKdd4LD8foDM3F/yv/3V\n\
-igG14D5EjKz56SaBDNgiI4++hOzb2M8jhAsR86jxkXFrrP1U3ZNRKg6av9DPFAPS\n\
-WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
-=fRMg\n\
------END PGP PUBLIC KEY BLOCK-----' > /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ
&& \
- rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ && \
- yum install -y epel-release && \
- yum install -y centos-release-xen-48 && \
- yum install -y \
- audit-libs-devel \
- augeas \
- avahi-devel \
- bash-completion \
- ca-certificates \
- ccache \
- clang \
- cpp \
- cyrus-sasl-devel \
- dbus-devel \
- device-mapper-devel \
- diffutils \
- dnsmasq \
- dwarves \
- ebtables \
- firewalld-filesystem \
- fuse-devel \
- gcc \
- gettext \
- git \
- glib2-devel \
- glibc-common \
- glibc-devel \
- glusterfs-api-devel \
- gnutls-devel \
- grep \
- iproute \
- iptables \
- iscsi-initiator-utils \
- kmod \
- libacl-devel \
- libattr-devel \
- libblkid-devel \
- libcap-ng-devel \
- libcurl-devel \
- libiscsi-devel \
- libnl3-devel \
- libpcap-devel \
- libpciaccess-devel \
- libprlsdk-devel \
- librbd1-devel \
- libselinux-devel \
- libssh-devel \
- libssh2-devel \
- libtirpc-devel \
- libudev-devel \
- libwsman-devel \
- libxml2 \
- libxml2-devel \
- libxslt \
- lvm2 \
- make \
- netcf-devel \
- nfs-utils \
- ninja-build \
- numactl-devel \
- numad \
- parted \
- parted-devel \
- perl \
- pkgconfig \
- polkit \
- python3 \
- python3-pip \
- python3-setuptools \
- python3-wheel \
- python36-docutils \
- qemu-img \
- radvd \
- readline-devel \
- rpm-build \
- sanlock-devel \
- scrub \
- sed \
- systemtap-sdt-devel \
- wireshark-devel \
- xen-devel \
- xfsprogs-devel \
- yajl-devel && \
- yum autoremove -y && \
- yum 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
-
-RUN pip3 install \
- meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja-build"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--
2.26.3
6:16 a.m.
On Tue, May 04, 2021 at 12:04:52PM +0200, Andrea Bolognani wrote:
This brings our pipeline in sync with the current status of the
libvirt-ci repository.
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/296773363
Andrea Bolognani (8):
ci: Remove Fedora Rawhide dwarf4 hack
ci: Rename CentOS Stream 8 and openSUSE Leap 15.2 containers
ci: Refresh contents
ci: Add openSUSE Tumbleweed
ci: Add FreeBSD 13
ci: Add Fedora 34
ci: Drop Fedora 32
ci: Drop CentOS 7
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
1297
days inactive
1298
days old
9 comments
2 participants
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé