11:22 a.m.
Centos-8 was killed off, so lcitool suggests using AlmaLinux 8 as a
replacement.
Re-generate the manifests with new lcitool.
Pipeline with these patches:
https://gitlab.com/pipo.sk/libvirt/-/pipelines/470699381
Peter Krempa (3):
ci: Regenerate with new lcitool
ci: Move from 'centos-8' to 'almalinux-8'
ci: Regenerate with new lcitool
.gitlab-ci.yml | 6 +-
...os-8.Dockerfile => almalinux-8.Dockerfile} | 2 +-
ci/containers/centos-stream-9.Dockerfile | 3 +
.../debian-10-cross-aarch64.Dockerfile | 3 +-
.../debian-10-cross-armv6l.Dockerfile | 3 +-
.../debian-10-cross-armv7l.Dockerfile | 3 +-
ci/containers/debian-10-cross-i686.Dockerfile | 3 +-
ci/containers/debian-10-cross-mips.Dockerfile | 3 +-
.../debian-10-cross-mips64el.Dockerfile | 3 +-
.../debian-10-cross-mipsel.Dockerfile | 3 +-
.../debian-10-cross-ppc64le.Dockerfile | 3 +-
.../debian-10-cross-s390x.Dockerfile | 3 +-
ci/containers/debian-10.Dockerfile | 3 +-
ci/containers/opensuse-leap-152.Dockerfile | 3 +-
ci/containers/ubuntu-1804.Dockerfile | 3 +-
ci/containers/ubuntu-2004.Dockerfile | 3 +-
ci/gitlab.yml | 74 ++++++++++---------
ci/manifest.yml | 2 +-
18 files changed, 59 insertions(+), 67 deletions(-)
rename ci/containers/{centos-8.Dockerfile => almalinux-8.Dockerfile} (98%)
--
2.34.1
11:22 a.m.
New subject: [PATCH 1/3] ci: Regenerate with new lcitool
Re-generate our CI infra with 'lcitool' as of:
commit b346752e98bd12395233ebba8c9312e08212b639 (HEAD)
Author: Erik Skultety <eskultet(a)redhat.com>
Date: Tue Feb 1 10:48:53 2022 +0100
tests: Replace CentOS 8 with AlmaLinux 8 in test scenarios
Switch the test target before actually dropping CentOS 8.
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
This is prior to upstream lcitool dropping 'centos-8' support to
minimize the differences.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
ci/gitlab.yml | 58 ++++++++++++++++++++++++++-------------------------
1 file changed, 30 insertions(+), 28 deletions(-)
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index 03dee70480..48e6363c7c 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -395,9 +395,9 @@ x86_64-centos-8-clang:
- x86_64-centos-8-container
allow_failure: false
variables:
+ CC: clang
NAME: centos-8
RPM: skip
- CC: clang
x86_64-centos-stream-8:
@@ -408,6 +408,7 @@ x86_64-centos-stream-8:
variables:
NAME: centos-stream-8
+
x86_64-centos-stream-9:
extends: .native_build_job
needs:
@@ -416,6 +417,7 @@ x86_64-centos-stream-9:
variables:
NAME: centos-stream-9
+
x86_64-debian-10:
extends: .native_build_job
needs:
@@ -485,8 +487,8 @@ x86_64-fedora-rawhide-clang:
- x86_64-fedora-rawhide-container
allow_failure: true
variables:
- NAME: fedora-rawhide
CC: clang
+ NAME: fedora-rawhide
RPM: skip
@@ -525,9 +527,9 @@ x86_64-ubuntu-2004:
- x86_64-ubuntu-2004-container
allow_failure: false
variables:
- NAME: ubuntu-2004
ASAN_OPTIONS: verify_asan_link_order=0
MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
+ NAME: ubuntu-2004
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
@@ -537,9 +539,9 @@ x86_64-ubuntu-2004-clang:
- x86_64-ubuntu-2004-container
allow_failure: false
variables:
- NAME: ubuntu-2004
CC: clang
MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
+ NAME: ubuntu-2004
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
@@ -552,8 +554,8 @@ armv6l-debian-10:
- armv6l-debian-10-container
allow_failure: false
variables:
- NAME: debian-10
CROSS: armv6l
+ NAME: debian-10
mips-debian-10:
@@ -562,8 +564,8 @@ mips-debian-10:
- mips-debian-10-container
allow_failure: false
variables:
- NAME: debian-10
CROSS: mips
+ NAME: debian-10
mipsel-debian-10:
@@ -572,8 +574,8 @@ mipsel-debian-10:
- mipsel-debian-10-container
allow_failure: false
variables:
- NAME: debian-10
CROSS: mipsel
+ NAME: debian-10
armv7l-debian-11:
@@ -582,8 +584,8 @@ armv7l-debian-11:
- armv7l-debian-11-container
allow_failure: false
variables:
- NAME: debian-11
CROSS: armv7l
+ NAME: debian-11
mips64el-debian-11:
@@ -592,8 +594,8 @@ mips64el-debian-11:
- mips64el-debian-11-container
allow_failure: false
variables:
- NAME: debian-11
CROSS: mips64el
+ NAME: debian-11
ppc64le-debian-11:
@@ -602,8 +604,8 @@ ppc64le-debian-11:
- ppc64le-debian-11-container
allow_failure: false
variables:
- NAME: debian-11
CROSS: ppc64le
+ NAME: debian-11
aarch64-debian-sid:
@@ -612,8 +614,8 @@ aarch64-debian-sid:
- aarch64-debian-sid-container
allow_failure: true
variables:
- NAME: debian-sid
CROSS: aarch64
+ NAME: debian-sid
i686-debian-sid:
@@ -622,8 +624,8 @@ i686-debian-sid:
- i686-debian-sid-container
allow_failure: true
variables:
- NAME: debian-sid
CROSS: i686
+ NAME: debian-sid
s390x-debian-sid:
@@ -632,8 +634,8 @@ s390x-debian-sid:
- s390x-debian-sid-container
allow_failure: true
variables:
- NAME: debian-sid
CROSS: s390x
+ NAME: debian-sid
mingw64-fedora-35:
@@ -642,8 +644,8 @@ mingw64-fedora-35:
- mingw64-fedora-35-container
allow_failure: false
variables:
- NAME: fedora-35
CROSS: mingw64
+ NAME: fedora-35
mingw32-fedora-rawhide:
@@ -652,8 +654,8 @@ mingw32-fedora-rawhide:
- mingw32-fedora-rawhide-container
allow_failure: true
variables:
- NAME: fedora-rawhide
CROSS: mingw32
+ NAME: fedora-rawhide
# Native cirrus build jobs
@@ -663,13 +665,13 @@ x86_64-freebsd-12:
needs: []
allow_failure: false
variables:
- NAME: freebsd-12
- CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
- CIRRUS_VM_IMAGE_SELECTOR: image_family
CIRRUS_VM_IMAGE_NAME: freebsd-12-2
+ CIRRUS_VM_IMAGE_SELECTOR: image_family
+ CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
+ INSTALL_COMMAND: pkg install -y
+ NAME: freebsd-12
UPDATE_COMMAND: pkg update
UPGRADE_COMMAND: pkg upgrade -y
- INSTALL_COMMAND: pkg install -y
x86_64-freebsd-13:
@@ -677,13 +679,13 @@ x86_64-freebsd-13:
needs: []
allow_failure: false
variables:
- NAME: freebsd-13
- CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
- CIRRUS_VM_IMAGE_SELECTOR: image_family
CIRRUS_VM_IMAGE_NAME: freebsd-13-0
+ CIRRUS_VM_IMAGE_SELECTOR: image_family
+ CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
+ INSTALL_COMMAND: pkg install -y
+ NAME: freebsd-13
UPDATE_COMMAND: pkg update
UPGRADE_COMMAND: pkg upgrade -y
- INSTALL_COMMAND: pkg install -y
x86_64-macos-11:
@@ -691,12 +693,12 @@ x86_64-macos-11:
needs: []
allow_failure: false
variables:
- NAME: macos-11
- CIRRUS_VM_INSTANCE_TYPE: osx_instance
- CIRRUS_VM_IMAGE_SELECTOR: image
CIRRUS_VM_IMAGE_NAME: big-sur-base
- UPDATE_COMMAND: brew update
- UPGRADE_COMMAND: brew upgrade
+ CIRRUS_VM_IMAGE_SELECTOR: image
+ CIRRUS_VM_INSTANCE_TYPE: osx_instance
INSTALL_COMMAND: brew install
+ NAME: macos-11
PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+ UPDATE_COMMAND: brew update
+ UPGRADE_COMMAND: brew upgrade
--
2.34.1
11:22 a.m.
New subject: [PATCH 2/3] ci: Move from 'centos-8' to 'almalinux-8'
Upstream lcitool suggests that as a solution to 'centos-8' being
removed.
Move also the website and other jobs to depend on
'x86_64-almalinux-8-container'.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.gitlab-ci.yml | 6 +++---
...entos-8.Dockerfile => almalinux-8.Dockerfile} | 2 +-
ci/gitlab.yml | 16 ++++++++--------
ci/manifest.yml | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
rename ci/containers/{centos-8.Dockerfile => almalinux-8.Dockerfile} (98%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ba11a0431..ec1b284da7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ website:
stage: builds
image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
needs:
- - x86_64-centos-8-container
+ - x86_64-almalinux-8-container
before_script:
- *script_variables
script:
@@ -94,7 +94,7 @@ potfile:
stage: builds
image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
needs:
- - x86_64-centos-8-container
+ - x86_64-almalinux-8-container
rules:
- if: "$CI_COMMIT_BRANCH == 'master'"
before_script:
@@ -116,7 +116,7 @@ potfile:
coverity:
image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
needs:
- - x86_64-centos-8-container
+ - x86_64-almalinux-8-container
stage: builds
script:
- curl https://scan.coverity.com/download/linux64 --form
project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN -o
/tmp/cov-analysis-linux64.tgz
diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile
similarity index 98%
rename from ci/containers/centos-8.Dockerfile
rename to ci/containers/almalinux-8.Dockerfile
index f01ca6a0d9..55ce0908a3 100644
--- a/ci/containers/centos-8.Dockerfile
+++ b/ci/containers/almalinux-8.Dockerfile
@@ -4,7 +4,7 @@
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/centos:8
+FROM docker.io/library/almalinux:8
RUN dnf update -y && \
dnf install 'dnf-command(config-manager)' -y && \
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index 48e6363c7c..cc03a2fe49 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -80,11 +80,11 @@ check-dco:
# Native container jobs
-x86_64-centos-8-container:
+x86_64-almalinux-8-container:
extends: .container_job
allow_failure: false
variables:
- NAME: centos-8
+ NAME: almalinux-8
x86_64-centos-stream-8-container:
@@ -379,24 +379,24 @@ mingw64-fedora-rawhide-container:
# Native build jobs
-x86_64-centos-8:
+x86_64-almalinux-8:
extends: .native_build_job
needs:
- - x86_64-centos-8-container
+ - x86_64-almalinux-8-container
allow_failure: false
variables:
- NAME: centos-8
+ NAME: almalinux-8
RPM: skip
-x86_64-centos-8-clang:
+x86_64-almalinux-8-clang:
extends: .native_build_job
needs:
- - x86_64-centos-8-container
+ - x86_64-almalinux-8-container
allow_failure: false
variables:
CC: clang
- NAME: centos-8
+ NAME: almalinux-8
RPM: skip
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 1cc589955c..87d923ae78 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -6,7 +6,7 @@ gitlab:
project: libvirt
targets:
- centos-8:
+ almalinux-8:
jobs:
- arch: x86_64
variables:
--
2.34.1
11:47 a.m.
New subject: [PATCH 2/3] ci: Move from 'centos-8' to 'almalinux-8'
On Mon, Feb 14, 2022 at 18:22:17 +0100, Peter Krempa wrote:
Upstream lcitool suggests that as a solution to 'centos-8'
being
removed.
Move also the website and other jobs to depend on
'x86_64-almalinux-8-container'.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.gitlab-ci.yml | 6 +++---
...entos-8.Dockerfile => almalinux-8.Dockerfile} | 2 +-
ci/gitlab.yml | 16 ++++++++--------
ci/manifest.yml | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
rename ci/containers/{centos-8.Dockerfile => almalinux-8.Dockerfile} (98%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ba11a0431..ec1b284da7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ website:
stage: builds
image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
needs:
- - x86_64-centos-8-container
+ - x86_64-almalinux-8-container
before_script:
- *script_variables
script:
@@ -94,7 +94,7 @@ potfile:
stage: builds
image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
needs:
- - x86_64-centos-8-container
+ - x86_64-almalinux-8-container
rules:
- if: "$CI_COMMIT_BRANCH == 'master'"
before_script:
@@ -116,7 +116,7 @@ potfile:
coverity:
image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
Hmm, I presume these also need to be changed to 'ci-almalinux-8'.
I'll update the patch before pushing.
11:49 a.m.
New subject: [PATCH 2/3] ci: Move from 'centos-8' to 'almalinux-8'
On Mon, Feb 14, 2022 at 06:47:11PM +0100, Peter Krempa wrote:
On Mon, Feb 14, 2022 at 18:22:17 +0100, Peter Krempa wrote:
> Upstream lcitool suggests that as a solution to 'centos-8' being
> removed.
>
> Move also the website and other jobs to depend on
> 'x86_64-almalinux-8-container'.
>
> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
> ---
> .gitlab-ci.yml | 6 +++---
> ...entos-8.Dockerfile => almalinux-8.Dockerfile} | 2 +-
> ci/gitlab.yml | 16 ++++++++--------
> ci/manifest.yml | 2 +-
> 4 files changed, 13 insertions(+), 13 deletions(-)
> rename ci/containers/{centos-8.Dockerfile => almalinux-8.Dockerfile} (98%)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 6ba11a0431..ec1b284da7 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -58,7 +58,7 @@ website:
> stage: builds
> image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
> needs:
> - - x86_64-centos-8-container
> + - x86_64-almalinux-8-container
> before_script:
> - *script_variables
> script:
> @@ -94,7 +94,7 @@ potfile:
> stage: builds
> image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
> needs:
> - - x86_64-centos-8-container
> + - x86_64-almalinux-8-container
> rules:
> - if: "$CI_COMMIT_BRANCH == 'master'"
> before_script:
> @@ -116,7 +116,7 @@ potfile:
> coverity:
> image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
Hmm, I presume these also need to be changed to 'ci-almalinux-8'.
I'll update the patch before pushing.
Yes, indeed.
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 :|
11:22 a.m.
New subject: [PATCH 3/3] ci: Regenerate with new lcitool
Regenerate with lcitool as of:
commit f83b916d5efa4bd33fbf4b7ea41bf6d535cc63fb
Author: Alex Bennée <alex.bennee(a)linaro.org>
Date: Fri Feb 11 09:39:30 2022 +0000
mappings: skip multipath-tools for cross Debian
This package is both a mix of library files, headers and native
binaries so cannot be installed in a cross environment. For now skip
it for cross targets.
See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1005323
Signed-off-by: Alex Bennée <alex.bennee(a)linaro.org>
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
ci/containers/centos-stream-9.Dockerfile | 3 +++
ci/containers/debian-10-cross-aarch64.Dockerfile | 3 +--
ci/containers/debian-10-cross-armv6l.Dockerfile | 3 +--
ci/containers/debian-10-cross-armv7l.Dockerfile | 3 +--
ci/containers/debian-10-cross-i686.Dockerfile | 3 +--
ci/containers/debian-10-cross-mips.Dockerfile | 3 +--
ci/containers/debian-10-cross-mips64el.Dockerfile | 3 +--
ci/containers/debian-10-cross-mipsel.Dockerfile | 3 +--
ci/containers/debian-10-cross-ppc64le.Dockerfile | 3 +--
ci/containers/debian-10-cross-s390x.Dockerfile | 3 +--
ci/containers/debian-10.Dockerfile | 3 +--
ci/containers/opensuse-leap-152.Dockerfile | 3 +--
ci/containers/ubuntu-1804.Dockerfile | 3 +--
ci/containers/ubuntu-2004.Dockerfile | 3 +--
14 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/ci/containers/centos-stream-9.Dockerfile
b/ci/containers/centos-stream-9.Dockerfile
index 4e2e10b078..d20602b847 100644
--- a/ci/containers/centos-stream-9.Dockerfile
+++ b/ci/containers/centos-stream-9.Dockerfile
@@ -9,6 +9,9 @@ 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 \
+ https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
+ https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm
&& \
dnf install -y \
audit-libs-devel \
augeas \
diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile
b/ci/containers/debian-10-cross-aarch64.Dockerfile
index 07994c1538..ca6b36b439 100644
--- a/ci/containers/debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-10-cross-aarch64.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN pip3 install \
- meson==0.56.0
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile
b/ci/containers/debian-10-cross-armv6l.Dockerfile
index bef7bf74c2..6818d6c409 100644
--- a/ci/containers/debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv6l.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN pip3 install \
- meson==0.56.0
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile
b/ci/containers/debian-10-cross-armv7l.Dockerfile
index 9b6f2716e1..726d5d5846 100644
--- a/ci/containers/debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv7l.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN pip3 install \
- meson==0.56.0
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-i686.Dockerfile
b/ci/containers/debian-10-cross-i686.Dockerfile
index 1720d968b0..16e29e00c9 100644
--- a/ci/containers/debian-10-cross-i686.Dockerfile
+++ b/ci/containers/debian-10-cross-i686.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN pip3 install \
- meson==0.56.0
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-mips.Dockerfile
b/ci/containers/debian-10-cross-mips.Dockerfile
index f625ed3240..d5cabb47c4 100644
--- a/ci/containers/debian-10-cross-mips.Dockerfile
+++ b/ci/containers/debian-10-cross-mips.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN pip3 install \
- meson==0.56.0
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile
b/ci/containers/debian-10-cross-mips64el.Dockerfile
index e24aec9b6a..ff63c2b5da 100644
--- a/ci/containers/debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-10-cross-mips64el.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN pip3 install \
- meson==0.56.0
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile
b/ci/containers/debian-10-cross-mipsel.Dockerfile
index 1af05e5184..93b68bd10e 100644
--- a/ci/containers/debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-10-cross-mipsel.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN pip3 install \
- meson==0.56.0
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile
b/ci/containers/debian-10-cross-ppc64le.Dockerfile
index bd2b921e9d..5577056754 100644
--- a/ci/containers/debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN pip3 install \
- meson==0.56.0
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile
b/ci/containers/debian-10-cross-s390x.Dockerfile
index 8a8a3fc05b..886d532927 100644
--- a/ci/containers/debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/debian-10-cross-s390x.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN pip3 install \
- meson==0.56.0
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
index 41284a15db..63d070cb37 100644
--- a/ci/containers/debian-10.Dockerfile
+++ b/ci/containers/debian-10.Dockerfile
@@ -97,8 +97,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/opensuse-leap-152.Dockerfile
b/ci/containers/opensuse-leap-152.Dockerfile
index d81bdea08e..864dfa4fa7 100644
--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@@ -92,8 +92,7 @@ RUN zypper update -y && \
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
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile
index 970d920310..5e9f90cdba 100644
--- a/ci/containers/ubuntu-1804.Dockerfile
+++ b/ci/containers/ubuntu-1804.Dockerfile
@@ -99,8 +99,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index 5cff997255..b6b10f2cbe 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -98,8 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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
+RUN pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
--
2.34.1
11:33 a.m.
On Mon, Feb 14, 2022 at 06:22:15PM +0100, Peter Krempa wrote:
Centos-8 was killed off, so lcitool suggests using AlmaLinux 8 as a
replacement.
Re-generate the manifests with new lcitool.
Pipeline with these patches:
https://gitlab.com/pipo.sk/libvirt/-/pipelines/470699381
Peter Krempa (3):
ci: Regenerate with new lcitool
ci: Move from 'centos-8' to 'almalinux-8'
ci: Regenerate with new lcitool
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 :|
1004
days inactive
1004
days old
6 comments
2 participants
participants (2)
-
Daniel P. Berrangé -
Peter Krempa