| Message ID | 20230119180419.30304-11-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next updates (gitlab, docker, check-tcg) | expand |
On 19/1/23 19:04, Alex Bennée wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > 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> > Message-Id: <20230110132700.833690-7-marcandre.lureau@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/dockerfiles/fedora-win32-cross.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 +++--- > 5 files changed, 10 insertions(+), 10 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 1/19/23 20:35, Philippe Mathieu-Daudé wrote: > On 19/1/23 19:04, Alex Bennée wrote: >> From: Marc-André Lureau <marcandre.lureau@redhat.com> >> >> Fedora 35 is EOL. >> >> Update to upstream lcitool, that dropped f35 and added f37. If you also have time to update to commit 40589eed1c56f040d0f07fc354c242a0e0d83185 that would be nice (see https://patchew.org/QEMU/20230117091638.50523-1-pbonzini@redhat.com/ for more information). Otherwise, no hurry. Paolo >> >> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> >> Reviewed-by: Thomas Huth <thuth@redhat.com> >> Message-Id: <20230110132700.833690-7-marcandre.lureau@redhat.com> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> --- >> tests/docker/dockerfiles/fedora-win32-cross.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 +++--- >> 5 files changed, 10 insertions(+), 10 deletions(-) > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > >
Paolo Bonzini <pbonzini@redhat.com> writes: > On 1/19/23 20:35, Philippe Mathieu-Daudé wrote: >> On 19/1/23 19:04, Alex Bennée wrote: >>> From: Marc-André Lureau <marcandre.lureau@redhat.com> >>> >>> Fedora 35 is EOL. >>> >>> Update to upstream lcitool, that dropped f35 and added f37. > > If you also have time to update to commit > 40589eed1c56f040d0f07fc354c242a0e0d83185 that would be nice (see > https://patchew.org/QEMU/20230117091638.50523-1-pbonzini@redhat.com/ > for more information). Otherwise, no hurry. This round of testing/next has been painful enough, I'd like to get the PR out of the way before starting again. > > Paolo > >>> >>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> >>> Reviewed-by: Thomas Huth <thuth@redhat.com> >>> Message-Id: <20230110132700.833690-7-marcandre.lureau@redhat.com> >>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >>> --- >>> tests/docker/dockerfiles/fedora-win32-cross.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 +++--- >>> 5 files changed, 10 insertions(+), 10 deletions(-) >> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 75383ba185..cc5d1ac4be 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,10 +1,10 @@ # 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 -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 98c03dc13b..cabbf4edfc 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 mingw64 fedora-35 qemu +# $ lcitool dockerfile --layers all --cross mingw64 fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index d200c7fc10..f44b005000 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-35 qemu +# $ lcitool dockerfile --layers all fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index e3eb28cf2e..319a534c22 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5 +Subproject commit 319a534c220f53fc8670254cac25d6f662c82112 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index fa966e4009..a5ea0efc3b 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -111,7 +111,7 @@ try: generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("debian-amd64", "debian-11", trailer="".join(debian11_extras)) - generate_dockerfile("fedora", "fedora-35") + generate_dockerfile("fedora", "fedora-37") generate_dockerfile("opensuse-leap", "opensuse-leap-153") generate_dockerfile("ubuntu2004", "ubuntu-2004", trailer="".join(ubuntu2004_tsanhack)) @@ -161,12 +161,12 @@ try: trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user")) - generate_dockerfile("fedora-win32-cross", "fedora-35", + generate_dockerfile("fedora-win32-cross", "fedora-37", cross="mingw32", trailer=cross_build("i686-w64-mingw32-", "i386-softmmu")) - generate_dockerfile("fedora-win64-cross", "fedora-35", + generate_dockerfile("fedora-win64-cross", "fedora-37", cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", "x86_64-softmmu"))