1. Patchew
  2. QEMU
  3. [PATCH 00/10] testing/next: purging centos and more lcitool
  4. View patch

[PATCH 07/10] tests/lcitool: bump to latest version

Alex Bennée posted 10 patches 5 months, 4 weeks ago
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Radoslaw Biernacki <rad@semihalf.com>, Peter Maydell <peter.maydell@linaro.org>, Leif Lindholm <quic_llindhol@quicinc.com>, Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>, Cleber Rosa <crosa@redhat.com>
[PATCH 07/10] tests/lcitool: bump to latest version
Posted by Alex Bennée 5 months, 4 weeks ago 
We have to simultaneously update a few bits on our side as lcitool has
already deprecated fedora-38, alpine-3.18 and centos-8-stream. However
there is no change to the package list yet.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
v2
  - fix typo s/lci-tool/lcitool/
---
 tests/docker/dockerfiles/alpine.docker             | 4 ++--
 tests/docker/dockerfiles/fedora-win64-cross.docker | 4 ++--
 tests/docker/dockerfiles/fedora.docker             | 4 ++--
 tests/lcitool/libvirt-ci                           | 2 +-
 tests/lcitool/refresh                              | 6 +++---
 tests/lcitool/targets/centos-stream-8.yml          | 3 ---
 6 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 tests/lcitool/targets/centos-stream-8.yml

diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 554464f31e..b76cc2a35e 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all alpine-318 qemu
+#  $ lcitool dockerfile --layers all alpine-320 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM docker.io/library/alpine:3.18
+FROM docker.io/library/alpine:3.20
 
 RUN apk update && \
     apk upgrade && \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 0f78711876..cce6739613 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-38 qemu,qemu-win-installer
+#  $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-40 qemu,qemu-win-installer
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:38
+FROM registry.fedoraproject.org/fedora:40
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 098c894d10..bd51e1e149 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all fedora-38 qemu
+#  $ lcitool dockerfile --layers all fedora-40 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:38
+FROM registry.fedoraproject.org/fedora:40
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index cec6703971..a300a26c0d 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit cec67039719becbfbab866f9c23574f389cf9559
+Subproject commit a300a26c0d7f48544c40af268b3245ebd63c7351
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 789acefb75..ace4d08364 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -124,11 +124,11 @@ try:
     #
     # Standard native builds
     #
-    generate_dockerfile("alpine", "alpine-318")
+    generate_dockerfile("alpine", "alpine-320")
     generate_dockerfile("centos9", "centos-stream-9")
     generate_dockerfile("debian", "debian-12",
                         trailer="".join(debian12_extras))
-    generate_dockerfile("fedora", "fedora-38")
+    generate_dockerfile("fedora", "fedora-40")
     generate_dockerfile("opensuse-leap", "opensuse-leap-15")
     generate_dockerfile("ubuntu2204", "ubuntu-2204")
 
@@ -191,7 +191,7 @@ try:
                         trailer=cross_build("s390x-linux-gnu-",
                                             "s390x-softmmu,s390x-linux-user"))
 
-    generate_dockerfile("fedora-win64-cross", "fedora-38",
+    generate_dockerfile("fedora-win64-cross", "fedora-40",
                         project='qemu,qemu-win-installer',
                         cross="mingw64",
                         trailer=cross_build("x86_64-w64-mingw32-",
diff --git a/tests/lcitool/targets/centos-stream-8.yml b/tests/lcitool/targets/centos-stream-8.yml
deleted file mode 100644
index 6b11160fd1..0000000000
--- a/tests/lcitool/targets/centos-stream-8.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-paths:
-  pip3: /usr/bin/pip3.8
-  python: /usr/bin/python3.8
-- 
2.39.2
Re: [PATCH 07/10] tests/lcitool: bump to latest version
Posted by Thomas Huth 5 months, 4 weeks ago 
On 29/05/2024 18.09, Alex Bennée wrote:
> We have to simultaneously update a few bits on our side as lcitool has
> already deprecated fedora-38, alpine-3.18 and centos-8-stream. However
> there is no change to the package list yet.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Have you tried a CI run with these changes? I don't think this will work 
yet. There are various issues with Fedora 40 that we need to solve first. 
Some of them are addressed with patches in my pull request from today, but 
others need more work first:

- Avocado v88 is broken on Fedora 40 due to the missing "imp" package.
   I've got a pull request for lci-tool pending, but it is not merged yet:
   https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/489

- The "clang-system" jobs are failing due to the new -fsanitize=undefined
   errors that it discovers. Question is whether we want to fix all of them,
   or whether we disable the error detection instead.

- build-oss-fuzz job was failing, but that should get fixed with the
   patches from my PR from today (thanks to Alexander Bulekov for the
   patches)

So unless I missed something, you've got to postpone this patch a little bit.

  Thomas
Re: [PATCH 07/10] tests/lcitool: bump to latest version
Posted by Alex Bennée 5 months, 4 weeks ago 
Thomas Huth <thuth@redhat.com> writes:

> On 29/05/2024 18.09, Alex Bennée wrote:
>> We have to simultaneously update a few bits on our side as lcitool has
>> already deprecated fedora-38, alpine-3.18 and centos-8-stream. However
>> there is no change to the package list yet.
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>
> Have you tried a CI run with these changes? I don't think this will
> work yet. There are various issues with Fedora 40 that we need to
> solve first. Some of them are addressed with patches in my pull
> request from today, but others need more work first:
>
> - Avocado v88 is broken on Fedora 40 due to the missing "imp" package.
>   I've got a pull request for lci-tool pending, but it is not merged yet:
>   https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/489
>
> - The "clang-system" jobs are failing due to the new -fsanitize=undefined
>   errors that it discovers. Question is whether we want to fix all of them,
>   or whether we disable the error detection instead.
>
> - build-oss-fuzz job was failing, but that should get fixed with the
>   patches from my PR from today (thanks to Alexander Bulekov for the
>   patches)
>
> So unless I missed something, you've got to postpone this patch a
> little bit.

Ahh yes I see failures for:

  build-oss-fuzz
  clang-system

https://gitlab.com/stsquad/qemu/-/pipelines/1310569965/failures

>
>  Thomas

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.