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

lcitool: bump libvirt-ci submodule and regenerate

Browse Source 
This brings in a newer version of the pipewire mapping, so rename it.

Python 3.9 and 3.10 do not seem to work in OpenSUSE LEAP 15.5 (weird,
because 3.9 persisted from 15.3 to 15.4) so bump the Python runtime
version to 3.11.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-08-08 15:31:22 +02:00
parent 71ed611cd4
commit dcb8541b0b
16 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/docker/dockerfiles/debian-amd64-cross.docker
View File

@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile --layers all --cross x86_64 debian-11 qemu
# $ lcitool dockerfile --layers all --cross-arch x86_64 debian-11 qemu
#
# https://gitlab.com/libvirt/libvirt-ci

2
tests/docker/dockerfiles/debian-arm64-cross.docker
View File

@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile --layers all --cross aarch64 debian-11 qemu
# $ lcitool dockerfile --layers all --cross-arch aarch64 debian-11 qemu
#
# https://gitlab.com/libvirt/libvirt-ci

2
tests/docker/dockerfiles/debian-armel-cross.docker
View File

@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile --layers all --cross armv6l debian-11 qemu
# $ lcitool dockerfile --layers all --cross-arch armv6l debian-11 qemu
#
# https://gitlab.com/libvirt/libvirt-ci

2
tests/docker/dockerfiles/debian-armhf-cross.docker
View File

@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile --layers all --cross armv7l debian-11 qemu
# $ lcitool dockerfile --layers all --cross-arch armv7l debian-11 qemu
#
# https://gitlab.com/libvirt/libvirt-ci

2
tests/docker/dockerfiles/debian-mips64el-cross.docker
View File

@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile --layers all --cross mips64el debian-11 qemu
# $ lcitool dockerfile --layers all --cross-arch mips64el debian-11 qemu
#
# https://gitlab.com/libvirt/libvirt-ci

2
tests/docker/dockerfiles/debian-mipsel-cross.docker
View File

@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile --layers all --cross mipsel debian-11 qemu
# $ lcitool dockerfile --layers all --cross-arch mipsel debian-11 qemu
#
# https://gitlab.com/libvirt/libvirt-ci

2
tests/docker/dockerfiles/debian-ppc64el-cross.docker
View File

@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile --layers all --cross ppc64le debian-11 qemu
# $ lcitool dockerfile --layers all --cross-arch ppc64le debian-11 qemu
#
# https://gitlab.com/libvirt/libvirt-ci

2
tests/docker/dockerfiles/debian-riscv64-cross.docker
View File

@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile --layers all --cross riscv64 debian-sid qemu-minimal
# $ lcitool dockerfile --layers all --cross-arch riscv64 debian-sid qemu-minimal
#
# https://gitlab.com/libvirt/libvirt-ci

2
tests/docker/dockerfiles/debian-s390x-cross.docker
View File

@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile --layers all --cross s390x debian-11 qemu
# $ lcitool dockerfile --layers all --cross-arch s390x debian-11 qemu
#
# https://gitlab.com/libvirt/libvirt-ci

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

@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile --layers all --cross mingw32 fedora-38 qemu
# $ lcitool dockerfile --layers all --cross-arch mingw32 fedora-38 qemu
#
# https://gitlab.com/libvirt/libvirt-ci

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

@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile --layers all --cross mingw64 fedora-38 qemu
# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-38 qemu
#
# https://gitlab.com/libvirt/libvirt-ci

22
tests/docker/dockerfiles/opensuse-leap.docker
View File

@ -4,7 +4,7 @@
#
# https://gitlab.com/libvirt/libvirt-ci
FROM registry.opensuse.org/opensuse/leap:15.4
FROM registry.opensuse.org/opensuse/leap:15.5
RUN zypper update -y && \
zypper install -y \
@ -90,9 +90,9 @@ RUN zypper update -y && \
pcre-devel-static \
pipewire-devel \
pkgconfig \
python39-base \
python39-pip \
python39-setuptools \
python311-base \
python311-pip \
python311-setuptools \
rdma-core-devel \
sed \
snappy-devel \
@ -125,18 +125,18 @@ RUN zypper update -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
RUN /usr/bin/pip3.9 install \
PyYAML \
meson==0.63.2 \
pillow \
sphinx \
sphinx-rtd-theme
RUN /usr/bin/pip3.11 install \
PyYAML \
meson==0.63.2 \
pillow \
sphinx \
sphinx-rtd-theme
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
ENV NINJA "/usr/bin/ninja"
ENV PYTHON "/usr/bin/python3.9"
ENV PYTHON "/usr/bin/python3.11"
# As a final step configure the user (if env is defined)
ARG USER
ARG UID

2
tests/lcitool/libvirt-ci

@ -1 +1 @@
Subproject commit 9bff3b763b5531a1490e238bfbf77306dc3a6dbb
Subproject commit bbd55b4d18cce8f89b5167675e434a6941315634

12
tests/lcitool/mappings.yml
View File

@ -9,7 +9,7 @@ mappings:
python3:
CentOSStream8: python38
OpenSUSELeap15: python39-base
OpenSUSELeap15: python311-base
python3-PyYAML:
CentOSStream8: python38-PyYAML
@ -17,7 +17,7 @@ mappings:
python3-devel:
CentOSStream8: python38-devel
OpenSUSELeap15: python39-devel
OpenSUSELeap15: python311-devel
python3-docutils:
CentOSStream8:
@ -37,7 +37,7 @@ mappings:
python3-pip:
CentOSStream8: python38-pip
OpenSUSELeap15: python39-pip
OpenSUSELeap15: python311-pip
python3-pillow:
CentOSStream8:
@ -49,7 +49,7 @@ mappings:
python3-setuptools:
CentOSStream8: python38-setuptools
OpenSUSELeap15: python39-setuptools
OpenSUSELeap15: python311-setuptools
python3-sphinx:
CentOSStream8:
@ -61,11 +61,11 @@ mappings:
python3-venv:
CentOSStream8: python38
OpenSUSELeap15: python39-base
OpenSUSELeap15: python311-base
python3-wheel:
CentOSStream8: python38-wheel
OpenSUSELeap15: python39-pip
OpenSUSELeap15: python311-pip
pypi_mappings:
# Request more recent version

2
tests/lcitool/projects/qemu.yml
View File

@ -85,7 +85,7 @@ packages:
- pam
- pcre-static
- pixman
- pipewire
- libpipewire-dev
- pkg-config
- pulseaudio
- python3

4
tests/lcitool/targets/opensuse-leap-15.yml
View File

@ -1,3 +1,3 @@
paths:
pip3: /usr/bin/pip3.9
python: /usr/bin/python3.9
pip3: /usr/bin/pip3.11
python: /usr/bin/python3.11