* [PATCH v3 0/2] tests: lcitool: Switch to OpenSUSE Leap 15.4
@ 2023-04-21 8:40 Paolo Bonzini
2023-04-21 8:40 ` [PATCH v3 1/2] tests: libvirt-ci: Update to commit '2fa24dce8bc' Paolo Bonzini
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Paolo Bonzini @ 2023-04-21 8:40 UTC (permalink / raw)
To: qemu-devel; +Cc: pkrempa, berrange
v3 of Peter's series, which uses a newer libvirt-ci commit. With this
version, future updates of the libvirt-ci submodule will pick new
Leap 15 releases without the need for changes to tests/lcitool/mappings.yml
or tests/lcitool/targets.
Paolo
Supersedes: <cover.1681735482.git.pkrempa@redhat.com>
Peter Krempa (2):
tests: libvirt-ci: Update to commit '2fa24dce8bc'
tests: lcitool: Switch to OpenSUSE Leap 15.4
tests/docker/dockerfiles/centos8.docker | 1 -
.../dockerfiles/debian-amd64-cross.docker | 4 +--
.../dockerfiles/debian-arm64-cross.docker | 4 +--
.../dockerfiles/debian-armel-cross.docker | 4 +--
.../dockerfiles/debian-armhf-cross.docker | 4 +--
.../dockerfiles/debian-mips64el-cross.docker | 4 +--
.../dockerfiles/debian-mipsel-cross.docker | 4 +--
.../dockerfiles/debian-ppc64el-cross.docker | 4 +--
.../dockerfiles/debian-s390x-cross.docker | 4 +--
.../dockerfiles/fedora-win32-cross.docker | 5 ++-
.../dockerfiles/fedora-win64-cross.docker | 5 ++-
tests/docker/dockerfiles/fedora.docker | 5 ++-
tests/docker/dockerfiles/opensuse-leap.docker | 5 ++-
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/mappings.yml | 36 +++++++++----------
tests/lcitool/refresh | 2 +-
...suse-leap-153.yml => opensuse-leap-15.yml} | 0
17 files changed, 44 insertions(+), 49 deletions(-)
rename tests/lcitool/targets/{opensuse-leap-153.yml => opensuse-leap-15.yml} (100%)
--
2.40.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3 1/2] tests: libvirt-ci: Update to commit '2fa24dce8bc'
2023-04-21 8:40 [PATCH v3 0/2] tests: lcitool: Switch to OpenSUSE Leap 15.4 Paolo Bonzini
@ 2023-04-21 8:40 ` Paolo Bonzini
2023-04-21 8:40 ` [PATCH v3 2/2] tests: lcitool: Switch to OpenSUSE Leap 15.4 Paolo Bonzini
2023-04-21 9:26 ` [PATCH v3 0/2] " Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2023-04-21 8:40 UTC (permalink / raw)
To: qemu-devel; +Cc: pkrempa, berrange
From: Peter Krempa <pkrempa@redhat.com>
Update to commit which has fixes needed for OpenSUSE 15.4 and
re-generate output files.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Message-Id: <bd11b5954d3dd1e989699370af2b9e2e0c77194a.1681735482.git.pkrempa@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/docker/dockerfiles/centos8.docker | 1 -
tests/docker/dockerfiles/debian-amd64-cross.docker | 4 ++--
tests/docker/dockerfiles/debian-arm64-cross.docker | 4 ++--
tests/docker/dockerfiles/debian-armel-cross.docker | 4 ++--
tests/docker/dockerfiles/debian-armhf-cross.docker | 4 ++--
tests/docker/dockerfiles/debian-mips64el-cross.docker | 4 ++--
tests/docker/dockerfiles/debian-mipsel-cross.docker | 4 ++--
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 4 ++--
tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++--
tests/docker/dockerfiles/fedora-win32-cross.docker | 5 ++---
tests/docker/dockerfiles/fedora-win64-cross.docker | 5 ++---
tests/docker/dockerfiles/fedora.docker | 5 ++---
tests/docker/dockerfiles/opensuse-leap.docker | 1 -
tests/lcitool/libvirt-ci | 2 +-
14 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 7e3a6217ae2d..1a6a9087c11f 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -100,7 +100,6 @@ RUN dnf distro-sync -y && \
python38-setuptools \
python38-wheel \
rdma-core-devel \
- rpm \
sed \
snappy-devel \
socat \
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index afb1cbd04638..2e7eb445f161 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -148,7 +148,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
+ printf "[binaries]\n\
c = '/usr/bin/x86_64-linux-gnu-gcc'\n\
ar = '/usr/bin/x86_64-linux-gnu-gcc-ar'\n\
strip = '/usr/bin/x86_64-linux-gnu-strip'\n\
@@ -158,7 +158,7 @@ pkgconfig = '/usr/bin/x86_64-linux-gnu-pkg-config'\n\
system = 'linux'\n\
cpu_family = 'x86_64'\n\
cpu = 'x86_64'\n\
-endian = 'little'" > /usr/local/share/meson/cross/x86_64-linux-gnu && \
+endian = 'little'\n" > /usr/local/share/meson/cross/x86_64-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-c++ && \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index b4f7a7f903ee..f558770f845a 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -147,7 +147,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
+ printf "[binaries]\n\
c = '/usr/bin/aarch64-linux-gnu-gcc'\n\
ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\
strip = '/usr/bin/aarch64-linux-gnu-strip'\n\
@@ -157,7 +157,7 @@ pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\
system = 'linux'\n\
cpu_family = 'aarch64'\n\
cpu = 'aarch64'\n\
-endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \
+endian = 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c++ && \
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
index 4b4191f82474..f3d7e07cce5a 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -146,7 +146,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
+ printf "[binaries]\n\
c = '/usr/bin/arm-linux-gnueabi-gcc'\n\
ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\
strip = '/usr/bin/arm-linux-gnueabi-strip'\n\
@@ -156,7 +156,7 @@ pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
system = 'linux'\n\
cpu_family = 'arm'\n\
cpu = 'arm'\n\
-endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \
+endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c++ && \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index c9b6b2e56377..531c556ad5aa 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -147,7 +147,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
+ printf "[binaries]\n\
c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\
ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\
strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\
@@ -157,7 +157,7 @@ pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\
system = 'linux'\n\
cpu_family = 'arm'\n\
cpu = 'armhf'\n\
-endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \
+endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-c++ && \
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index cfe4f9a0d7fb..816dbd29113f 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -144,7 +144,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
+ printf "[binaries]\n\
c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\
ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\
strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\
@@ -154,7 +154,7 @@ pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\
system = 'linux'\n\
cpu_family = 'mips64'\n\
cpu = 'mips64el'\n\
-endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \
+endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-c++ && \
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index 8e521fc9eec9..b115b29af3d6 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -144,7 +144,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
+ printf "[binaries]\n\
c = '/usr/bin/mipsel-linux-gnu-gcc'\n\
ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\
strip = '/usr/bin/mipsel-linux-gnu-strip'\n\
@@ -154,7 +154,7 @@ pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\
system = 'linux'\n\
cpu_family = 'mips'\n\
cpu = 'mipsel'\n\
-endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \
+endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-c++ && \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index b1b8277f3f32..301bddb5367a 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -146,7 +146,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
+ printf "[binaries]\n\
c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\
ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\
strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\
@@ -156,7 +156,7 @@ pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\
system = 'linux'\n\
cpu_family = 'ppc64'\n\
cpu = 'powerpc64le'\n\
-endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \
+endian = 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-c++ && \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index af39568ce53f..5d27c91c171a 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -145,7 +145,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
+ printf "[binaries]\n\
c = '/usr/bin/s390x-linux-gnu-gcc'\n\
ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\
strip = '/usr/bin/s390x-linux-gnu-strip'\n\
@@ -155,7 +155,7 @@ pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\
system = 'linux'\n\
cpu_family = 's390x'\n\
cpu = 's390x'\n\
-endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \
+endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-c++ && \
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index 1fc4c987f751..e7966ec7fd28 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -7,14 +7,14 @@
FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \
- echo -e '#!/bin/sh\n\
+ printf '#!/bin/sh\n\
if test -d /usr/lib64\n\
then\n\
export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
else\n\
export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
fi\n\
-exec "$@"' > /usr/bin/nosync && \
+exec "$@"\n' > /usr/bin/nosync && \
chmod +x /usr/bin/nosync && \
nosync dnf update -y && \
nosync dnf install -y \
@@ -50,7 +50,6 @@ exec "$@"' > /usr/bin/nosync && \
python3-pip \
python3-sphinx \
python3-sphinx_rtd_theme \
- rpm \
sed \
socat \
sparse \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 39a0617a9dcf..86c3a8f2ac04 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -7,14 +7,14 @@
FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \
- echo -e '#!/bin/sh\n\
+ printf '#!/bin/sh\n\
if test -d /usr/lib64\n\
then\n\
export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
else\n\
export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
fi\n\
-exec "$@"' > /usr/bin/nosync && \
+exec "$@"\n' > /usr/bin/nosync && \
chmod +x /usr/bin/nosync && \
nosync dnf update -y && \
nosync dnf install -y \
@@ -50,7 +50,6 @@ exec "$@"' > /usr/bin/nosync && \
python3-pip \
python3-sphinx \
python3-sphinx_rtd_theme \
- rpm \
sed \
socat \
sparse \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index e030c5fb1e4a..b698b7595de1 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -7,14 +7,14 @@
FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \
- echo -e '#!/bin/sh\n\
+ printf '#!/bin/sh\n\
if test -d /usr/lib64\n\
then\n\
export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
else\n\
export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
fi\n\
-exec "$@"' > /usr/bin/nosync && \
+exec "$@"\n' > /usr/bin/nosync && \
chmod +x /usr/bin/nosync && \
nosync dnf update -y && \
nosync dnf install -y \
@@ -110,7 +110,6 @@ exec "$@"' > /usr/bin/nosync && \
python3-sphinx \
python3-sphinx_rtd_theme \
rdma-core-devel \
- rpm \
sed \
snappy-devel \
socat \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 8e9500e44318..28f153b77b56 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -93,7 +93,6 @@ RUN zypper update -y && \
python39-pip \
python39-setuptools \
rdma-core-devel \
- rpm \
sed \
snappy-devel \
sndio-devel \
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index 232f41f160d4..2fa24dce8bc2 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit 232f41f160d4567b8c82dd52aa96c2bc3a5b75c1
+Subproject commit 2fa24dce8bc2d0d57b02b111dbdbd24e25d4ae95
--
2.40.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 2/2] tests: lcitool: Switch to OpenSUSE Leap 15.4
2023-04-21 8:40 [PATCH v3 0/2] tests: lcitool: Switch to OpenSUSE Leap 15.4 Paolo Bonzini
2023-04-21 8:40 ` [PATCH v3 1/2] tests: libvirt-ci: Update to commit '2fa24dce8bc' Paolo Bonzini
@ 2023-04-21 8:40 ` Paolo Bonzini
2023-04-21 9:26 ` [PATCH v3 0/2] " Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2023-04-21 8:40 UTC (permalink / raw)
To: qemu-devel; +Cc: pkrempa, berrange
From: Peter Krempa <pkrempa@redhat.com>
Since OpenSUSE Leap 15 counts as a single major release of an LTS distribution,
lcitool has changed the target name to remove the minor version. Adjust the
mappings and refresh script.
This also updates the dockerfile to 15.4, since the 15.3 version is EOL now:
https://get.opensuse.org/leap/15.3
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <a408b7f241ac59e5944db6ae2360a792305c36e0.1681735482.git.pkrempa@redhat.com>
[Adjust for target name change and reword commit message. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/docker/dockerfiles/opensuse-leap.docker | 4 +--
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/mappings.yml | 36 +++++++++----------
tests/lcitool/refresh | 2 +-
...suse-leap-153.yml => opensuse-leap-15.yml} | 0
5 files changed, 22 insertions(+), 22 deletions(-)
rename tests/lcitool/targets/{opensuse-leap-153.yml => opensuse-leap-15.yml} (100%)
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 28f153b77b56..afb9f5419f5c 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all opensuse-leap-153 qemu
+# $ lcitool dockerfile --layers all opensuse-leap-15 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM registry.opensuse.org/opensuse/leap:15.3
+FROM registry.opensuse.org/opensuse/leap:15.4
RUN zypper update -y && \
zypper install -y \
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index 2fa24dce8bc2..85487e140415 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit 2fa24dce8bc2d0d57b02b111dbdbd24e25d4ae95
+Subproject commit 85487e140415b2ac54b01a9a6b600fd7c21edc2f
diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml
index e4719e45516c..454963f07b86 100644
--- a/tests/lcitool/mappings.yml
+++ b/tests/lcitool/mappings.yml
@@ -1,71 +1,71 @@
mappings:
flake8:
CentOSStream8:
- OpenSUSELeap153:
+ OpenSUSELeap15:
meson:
CentOSStream8:
- OpenSUSELeap153:
+ OpenSUSELeap15:
python3:
CentOSStream8: python38
- OpenSUSELeap153: python39-base
+ OpenSUSELeap15: python39-base
python3-PyYAML:
CentOSStream8: python38-PyYAML
- OpenSUSELeap153:
+ OpenSUSELeap15:
python3-devel:
CentOSStream8: python38-devel
- OpenSUSELeap153: python39-devel
+ OpenSUSELeap15: python39-devel
python3-docutils:
CentOSStream8:
- OpenSUSELeap153:
+ OpenSUSELeap15:
python3-numpy:
CentOSStream8: python38-numpy
- OpenSUSELeap153:
+ OpenSUSELeap15:
python3-opencv:
CentOSStream8:
- OpenSUSELeap153:
+ OpenSUSELeap15:
python3-pillow:
CentOSStream8:
- OpenSUSELeap153:
+ OpenSUSELeap15:
python3-pip:
CentOSStream8: python38-pip
- OpenSUSELeap153: python39-pip
+ OpenSUSELeap15: python39-pip
python3-pillow:
CentOSStream8:
- OpenSUSELeap153:
+ OpenSUSELeap15:
python3-selinux:
CentOSStream8:
- OpenSUSELeap153:
+ OpenSUSELeap15:
python3-setuptools:
CentOSStream8: python38-setuptools
- OpenSUSELeap153: python39-setuptools
+ OpenSUSELeap15: python39-setuptools
python3-sphinx:
CentOSStream8:
- OpenSUSELeap153:
+ OpenSUSELeap15:
python3-sphinx-rtd-theme:
CentOSStream8:
- OpenSUSELeap153:
+ OpenSUSELeap15:
python3-venv:
CentOSStream8: python38
- OpenSUSELeap153: python39-base
+ OpenSUSELeap15: python39-base
python3-wheel:
CentOSStream8: python38-wheel
- OpenSUSELeap153: python39-pip
+ OpenSUSELeap15: python39-pip
pypi_mappings:
# Request more recent version
@@ -74,4 +74,4 @@ pypi_mappings:
# Drop packages that need devel headers
python3-numpy:
- OpenSUSELeap153:
+ OpenSUSELeap15:
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index c0d7ad551649..33ef1282dac4 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -120,7 +120,7 @@ try:
generate_dockerfile("debian-amd64", "debian-11",
trailer="".join(debian11_extras))
generate_dockerfile("fedora", "fedora-37")
- generate_dockerfile("opensuse-leap", "opensuse-leap-153")
+ generate_dockerfile("opensuse-leap", "opensuse-leap-15")
generate_dockerfile("ubuntu2004", "ubuntu-2004")
generate_dockerfile("ubuntu2204", "ubuntu-2204")
diff --git a/tests/lcitool/targets/opensuse-leap-153.yml b/tests/lcitool/targets/opensuse-leap-15.yml
similarity index 100%
rename from tests/lcitool/targets/opensuse-leap-153.yml
rename to tests/lcitool/targets/opensuse-leap-15.yml
--
2.40.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 0/2] tests: lcitool: Switch to OpenSUSE Leap 15.4
2023-04-21 8:40 [PATCH v3 0/2] tests: lcitool: Switch to OpenSUSE Leap 15.4 Paolo Bonzini
2023-04-21 8:40 ` [PATCH v3 1/2] tests: libvirt-ci: Update to commit '2fa24dce8bc' Paolo Bonzini
2023-04-21 8:40 ` [PATCH v3 2/2] tests: lcitool: Switch to OpenSUSE Leap 15.4 Paolo Bonzini
@ 2023-04-21 9:26 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-04-21 9:26 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: pkrempa, berrange
On 21/4/23 10:40, Paolo Bonzini wrote:
> v3 of Peter's series, which uses a newer libvirt-ci commit. With this
> version, future updates of the libvirt-ci submodule will pick new
> Leap 15 releases without the need for changes to tests/lcitool/mappings.yml
> or tests/lcitool/targets.
>
> Paolo
>
> Supersedes: <cover.1681735482.git.pkrempa@redhat.com>
>
> Peter Krempa (2):
> tests: libvirt-ci: Update to commit '2fa24dce8bc'
> tests: lcitool: Switch to OpenSUSE Leap 15.4
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-21 9:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-21 8:40 [PATCH v3 0/2] tests: lcitool: Switch to OpenSUSE Leap 15.4 Paolo Bonzini
2023-04-21 8:40 ` [PATCH v3 1/2] tests: libvirt-ci: Update to commit '2fa24dce8bc' Paolo Bonzini
2023-04-21 8:40 ` [PATCH v3 2/2] tests: lcitool: Switch to OpenSUSE Leap 15.4 Paolo Bonzini
2023-04-21 9:26 ` [PATCH v3 0/2] " Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).