fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests/lcitool: enable rust & refresh

Browse source 
Enable Rust on various distro images: alpine, centos, debian, fedora,
opensuse.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250924120426.2158655-19-marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2025-09-24 16:04:15 +04:00
parent 2086d47992
commit e05b9e3d9b
16 changed files with 41 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/docker/dockerfiles/alpine.docker
View file

@ -138,3 +138,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

2
tests/docker/dockerfiles/centos9.docker
View file

@ -142,3 +142,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

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

@ -188,3 +188,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

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

@ -187,3 +187,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

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

@ -184,3 +184,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

2
tests/docker/dockerfiles/debian-i686-cross.docker
View file

@ -184,3 +184,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

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

@ -183,3 +183,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

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

@ -183,3 +183,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

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

@ -186,3 +186,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

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

@ -189,3 +189,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

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

@ -185,3 +185,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

2
tests/docker/dockerfiles/debian.docker
View file

@ -175,3 +175,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

2
tests/docker/dockerfiles/fedora-rust-nightly.docker
View file

@ -185,3 +185,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

2
tests/docker/dockerfiles/fedora.docker
View file

@ -162,3 +162,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

2
tests/docker/dockerfiles/opensuse-leap.docker
View file

@ -148,3 +148,5 @@ ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1

14
tests/lcitool/refresh
View file

@ -63,7 +63,8 @@ add_user_mapping = [
" id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi\n"
]
def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None):
def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None,
enable_rust=True):
filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker")
cmd = lcitool_cmd + ["dockerfile"]
if cross is not None:
@ -75,6 +76,8 @@ def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None):
else:
trailer = "\n".join(add_user_mapping)
if enable_rust:
trailer += "\nENV ENABLE_RUST 1\n"
generate(filename, cmd, trailer)
@ -180,7 +183,9 @@ try:
generate_dockerfile("fedora", "fedora-41")
generate_dockerfile("opensuse-leap", "opensuse-leap-15")
generate_dockerfile("ubuntu2204", "ubuntu-2204",
trailer="".join(ubuntu2204_rust_extras))
trailer="".join(ubuntu2204_rust_extras),
# https://bugs.launchpad.net/ubuntu/+source/rustc-1.83/+bug/2120318
enable_rust=False)
#
# Non-fatal Rust-enabled build
@ -248,7 +253,10 @@ try:
project='qemu,qemu-win-installer',
cross="mingw64",
trailer=cross_build("x86_64-w64-mingw32-",
"x86_64-softmmu"))
"x86_64-softmmu"),
# linking with rust is buggy:
# https://github.com/mesonbuild/meson/pull/14991
enable_rust=False)
#
# Cirrus packages lists for GitLab