[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/10] tests/lcitool: bump to latest version
From: |
Alex Bennée |
Subject: |
[PATCH 07/10] tests/lcitool: bump to latest version |
Date: |
Wed, 29 May 2024 17:09:31 +0100 |
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
- [PATCH 00/10] testing/next: purging centos and more lcitool, Alex Bennée, 2024/05/29
- [PATCH 02/10] docs/devel: update references to centos to non-versioned container, Alex Bennée, 2024/05/29
- [PATCH 01/10] ci: remove centos-steam-8 customer runner, Alex Bennée, 2024/05/29
- [PATCH 03/10] tests/vm: update centos.aarch64 image to 9, Alex Bennée, 2024/05/29
- [PATCH 04/10] tests/vm: remove plain centos image, Alex Bennée, 2024/05/29
- [PATCH 07/10] tests/lcitool: bump to latest version,
Alex Bennée <=
- [PATCH 08/10] tests/lcitool: generate package lists for ansible, Alex Bennée, 2024/05/29
- [PATCH 06/10] docs/ci: clean-up references for consistency, Alex Bennée, 2024/05/29
- [PATCH 09/10] scripts/ci: drive ubuntu/build-environment.yml from lcitool, Alex Bennée, 2024/05/29
- [PATCH 05/10] scripts/ci: remove CentOS bits from common build-environment, Alex Bennée, 2024/05/29
- [PATCH 10/10] tests/avocado: update sbsa-ref firmware, Alex Bennée, 2024/05/29