mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update lcitool and fedora to 37

Browse Source 
Fedora 35 is EOL.

Update to upstream lcitool, that dropped f35 and added f37.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230110132700.833690-7-marcandre.lureau@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230124180127.1881110-11-alex.bennee@linaro.org>
This commit is contained in:
Marc-André Lureau 2023-01-24 18:01:02 +00:00 committed by Alex Bennée
parent 3ab8bf8341
commit 0054dc8bde
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/docker/dockerfiles/fedora-win32-cross.docker
View File

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all --cross mingw32 fedora-35 qemu # $ lcitool dockerfile --layers all --cross mingw32 fedora-37 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM registry.fedoraproject.org/fedora:35 FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \ RUN dnf install -y nosync && \
echo -e '#!/bin/sh\n\ echo -e '#!/bin/sh\n\

4
tests/docker/dockerfiles/fedora-win64-cross.docker
View File

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all --cross mingw64 fedora-35 qemu # $ lcitool dockerfile --layers all --cross mingw64 fedora-37 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM registry.fedoraproject.org/fedora:35 FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \ RUN dnf install -y nosync && \
echo -e '#!/bin/sh\n\ echo -e '#!/bin/sh\n\

4
tests/docker/dockerfiles/fedora.docker
View File

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all fedora-35 qemu # $ lcitool dockerfile --layers all fedora-37 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM registry.fedoraproject.org/fedora:35 FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \ RUN dnf install -y nosync && \
echo -e '#!/bin/sh\n\ echo -e '#!/bin/sh\n\

2
tests/lcitool/libvirt-ci

@ -1 +1 @@
Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5 Subproject commit 319a534c220f53fc8670254cac25d6f662c82112

6
tests/lcitool/refresh
View File

@ -111,7 +111,7 @@ try:
generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("centos8", "centos-stream-8")
generate_dockerfile("debian-amd64", "debian-11", generate_dockerfile("debian-amd64", "debian-11",
trailer="".join(debian11_extras)) trailer="".join(debian11_extras))
generate_dockerfile("fedora", "fedora-35") generate_dockerfile("fedora", "fedora-37")
generate_dockerfile("opensuse-leap", "opensuse-leap-153") generate_dockerfile("opensuse-leap", "opensuse-leap-153")
generate_dockerfile("ubuntu2004", "ubuntu-2004", generate_dockerfile("ubuntu2004", "ubuntu-2004",
trailer="".join(ubuntu2004_tsanhack)) trailer="".join(ubuntu2004_tsanhack))
@ -161,12 +161,12 @@ try:
trailer=cross_build("s390x-linux-gnu-", trailer=cross_build("s390x-linux-gnu-",
"s390x-softmmu,s390x-linux-user")) "s390x-softmmu,s390x-linux-user"))
generate_dockerfile("fedora-win32-cross", "fedora-35", generate_dockerfile("fedora-win32-cross", "fedora-37",
cross="mingw32", cross="mingw32",
trailer=cross_build("i686-w64-mingw32-", trailer=cross_build("i686-w64-mingw32-",
"i386-softmmu")) "i386-softmmu"))
generate_dockerfile("fedora-win64-cross", "fedora-35", generate_dockerfile("fedora-win64-cross", "fedora-37",
cross="mingw64", cross="mingw64",
trailer=cross_build("x86_64-w64-mingw32-", trailer=cross_build("x86_64-w64-mingw32-",
"x86_64-softmmu")) "x86_64-softmmu"))