tests/lcitool/refresh: use raw string literal for trailers
Using a list of string is not convenient, as users need to escape it manually and handle end of lines. By using a raw string literal, what you see is what you get. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Link: https://lore.kernel.org/qemu-devel/20260707214655.1138626-2-pierrick.bouvier@oss.qualcomm.com Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Pierrick Bouvier committed
Jul 7, 2026 at 14:46 UTC
532e8eeb1196eea40961f11df6da8a05663cd141
1 file changed
+107
-106
tests/lcitool/refresh
+107
-106
@@ -72,6 +72,7 @@ def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None,
72
cmd.extend([target, project])
73
74
if trailer is not None:
75
+ trailer = trailer.strip() + "\n"
76
trailer += "\n".join(add_user_mapping)
77
else:
78
trailer = "\n".join(add_user_mapping)
@@ -100,113 +101,113 @@ def generate_yaml(os, target, arch, trailer=None):
101
generate(filename, cmd, trailer)
102
103
103
-alpine_extras = [
104
- "# https://gitlab.alpinelinux.org/alpine/aports/-/issues/17463\n",
105
- "RUN apk add clang19-libclang\n",
106
-]
104
+alpine_extras = r"""
105
+# https://gitlab.alpinelinux.org/alpine/aports/-/issues/17463
106
+RUN apk add clang19-libclang
107
+"""
108
109
# Netmap still needs to be manually built as it is yet to be packaged
110
# into a distro. We also add cscope and gtags which are used in the CI
111
# test
111
-debian13_extras = [
112
- "# netmap/cscope/global\n",
113
- "RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n",
114
- " apt install -y --no-install-recommends \\\n",
115
- " cscope\\\n",
116
- " global\\\n",
117
- " linux-headers-generic\n",
118
- "RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap\n",
119
- "RUN cd /usr/src/netmap && git checkout v11.3\n",
120
- "RUN cd /usr/src/netmap/LINUX && \\\n",
121
- " ./configure --no-drivers --no-apps \\\n",
122
- " --kernel-dir=$(ls -d /usr/src/linux-headers-*-$(dpkg --print-architecture)) \\\n",
123
- " && make install\n",
124
- "ENV QEMU_CONFIGURE_OPTS=--enable-netmap\n"
125
-]
112
+debian13_extras = r"""
113
+# netmap/cscope/global
114
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
115
+ apt install -y --no-install-recommends \
116
+ cscope\
117
+ global\
118
+ linux-headers-generic
119
+RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap
120
+RUN cd /usr/src/netmap && git checkout v11.3
121
+RUN cd /usr/src/netmap/LINUX && \
122
+ ./configure --no-drivers --no-apps \
123
+ --kernel-dir=$(ls -d /usr/src/linux-headers-*-$(dpkg --print-architecture)) \
124
+ && make install
125
+ENV QEMU_CONFIGURE_OPTS=--enable-netmap
126
+"""
127
128
# Based on the hub.docker.com/library/rust Dockerfiles
128
-fedora_rustup_nightly_extras = [
129
- "RUN dnf install -y wget\n",
130
- "ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo\n",
131
- "ENV RUSTC=/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc\n",
132
- "ENV RUSTDOC=/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustdoc\n",
133
- "ENV CARGO=/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/cargo\n",
134
- "RUN set -eux && \\\n",
135
- " rustArch='x86_64-unknown-linux-gnu' && \\\n",
136
- " rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' && \\\n",
137
- ' url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" && \\\n',
138
- ' wget "$url" && \\\n',
139
- ' echo "${rustupSha256} *rustup-init" | sha256sum -c - && \\\n',
140
- " chmod +x rustup-init && \\\n",
141
- " ./rustup-init -y --no-modify-path --profile default --default-toolchain nightly --default-host ${rustArch} && \\\n",
142
- " chmod -R a+w $RUSTUP_HOME $CARGO_HOME && \\\n",
143
- " /usr/local/cargo/bin/rustup --version && \\\n",
144
- " /usr/local/cargo/bin/rustup run nightly cargo --version && \\\n",
145
- " /usr/local/cargo/bin/rustup run nightly rustc --version && \\\n",
146
- ' test "$CARGO" = "$(/usr/local/cargo/bin/rustup +nightly which cargo)" && \\\n',
147
- ' test "$RUSTDOC" = "$(/usr/local/cargo/bin/rustup +nightly which rustdoc)" && \\\n',
148
- ' test "$RUSTC" = "$(/usr/local/cargo/bin/rustup +nightly which rustc)"\n',
149
- 'ENV PATH=$CARGO_HOME/bin:$PATH\n',
150
- 'RUN /usr/local/cargo/bin/rustup run nightly cargo install --locked bindgen-cli\n',
151
- 'RUN $CARGO --list\n',
152
-]
153
-
154
-ubuntu2404_rust_extras = [
155
- "ENV RUSTC=/usr/bin/rustc-1.83\n",
156
- "ENV RUSTDOC=/usr/bin/rustdoc-1.83\n",
157
- "ENV CARGO_HOME=/usr/local/cargo\n",
158
- 'ENV PATH=$CARGO_HOME/bin:$PATH\n',
159
- "RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n",
160
- " apt install -y --no-install-recommends cargo\n",
161
- 'RUN cargo install --locked bindgen-cli\n',
162
-]
163
-
164
-debian_all_test_cross_compilers = [
165
- "# extras for cross and alternate toolchains\n",
166
- "RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n",
167
- " apt install -y --no-install-recommends \\\n",
168
- " clang\\\n",
169
- " dpkg-dev\\\n",
170
- " gdb-multiarch\\\n",
171
- " libclang-rt-dev\n",
172
- "ENV AVAILABLE_COMPILERS=\"\\\n",
173
- " gcc-aarch64-linux-gnu \\\n",
174
- " libc6-dev-arm64-cross \\\n",
175
- " gcc-arm-linux-gnueabihf \\\n",
176
- " libc6-dev-armhf-cross \\\n",
177
- " gcc-alpha-linux-gnu \\\n"
178
- " libc6.1-dev-alpha-cross \\\n"
179
- " gcc-mips-linux-gnu \\\n",
180
- " libc6-dev-mips-cross \\\n",
181
- " gcc-mips64-linux-gnuabi64 \\\n",
182
- " libc6-dev-mips64-cross \\\n",
183
- " gcc-mips64el-linux-gnuabi64 \\\n",
184
- " libc6-dev-mips64el-cross \\\n",
185
- " gcc-mipsel-linux-gnu \\\n",
186
- " libc6-dev-mipsel-cross \\\n",
187
- " gcc-powerpc64le-linux-gnu \\\n",
188
- " libc6-dev-ppc64el-cross \\\n",
189
- " gcc-riscv64-linux-gnu \\\n",
190
- " libc6-dev-riscv64-cross \\\n",
191
- " gcc-s390x-linux-gnu \\\n",
192
- " libc6-dev-s390x-cross\\\n",
193
- " gcc-sh4-linux-gnu \\\n",
194
- " libc6-dev-sh4-cross \\\n",
195
- " \"\n",
196
- "RUN if dpkg-architecture -e amd64; then \\\n",
197
- " export AVAILABLE_COMPILERS=\"${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu libc6-dev-hppa-cross\"; \\\n",
198
- " export AVAILABLE_COMPILERS=\"${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu libc6-dev-m68k-cross\"; \\\n",
199
- " export AVAILABLE_COMPILERS=\"${AVAILABLE_COMPILERS} gcc-powerpc-linux-gnu libc6-dev-powerpc-cross\"; \\\n",
200
- " export AVAILABLE_COMPILERS=\"${AVAILABLE_COMPILERS} gcc-powerpc64-linux-gnu libc6-dev-ppc64-cross\"; \\\n",
201
- " export AVAILABLE_COMPILERS=\"${AVAILABLE_COMPILERS} gcc-sparc64-linux-gnu libc6-dev-sparc64-cross\"; \\\n",
202
- "fi && \\\n",
203
- "DEBIAN_FRONTEND=noninteractive eatmydata \\\n",
204
- "apt install -y --no-install-recommends \\\n",
205
- "${AVAILABLE_COMPILERS} && \\\n",
206
- "dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt\n",
207
- "ENV QEMU_CONFIGURE_OPTS=--disable-docs\n",
208
- "ENV DEF_TARGET_LIST=aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user\n",
209
-]
129
+fedora_rustup_nightly_extras = r"""
130
+RUN dnf install -y wget
131
+ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo
132
+ENV RUSTC=/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc
133
+ENV RUSTDOC=/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustdoc
134
+ENV CARGO=/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/cargo
135
+RUN set -eux && \
136
+ rustArch='x86_64-unknown-linux-gnu' && \
137
+ rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' && \
138
+ url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" && \
139
+ wget "$url" && \
140
+ echo "${rustupSha256} *rustup-init" | sha256sum -c - && \
141
+ chmod +x rustup-init && \
142
+ ./rustup-init -y --no-modify-path --profile default --default-toolchain nightly --default-host ${rustArch} && \
143
+ chmod -R a+w $RUSTUP_HOME $CARGO_HOME && \
144
+ /usr/local/cargo/bin/rustup --version && \
145
+ /usr/local/cargo/bin/rustup run nightly cargo --version && \
146
+ /usr/local/cargo/bin/rustup run nightly rustc --version && \
147
+ test "$CARGO" = "$(/usr/local/cargo/bin/rustup +nightly which cargo)" && \
148
+ test "$RUSTDOC" = "$(/usr/local/cargo/bin/rustup +nightly which rustdoc)" && \
149
+ test "$RUSTC" = "$(/usr/local/cargo/bin/rustup +nightly which rustc)"
150
+ENV PATH=$CARGO_HOME/bin:$PATH
151
+RUN /usr/local/cargo/bin/rustup run nightly cargo install --locked bindgen-cli
152
+RUN $CARGO --list
153
+"""
154
+
155
+ubuntu2404_rust_extras = r"""
156
+ENV RUSTC=/usr/bin/rustc-1.83
157
+ENV RUSTDOC=/usr/bin/rustdoc-1.83
158
+ENV CARGO_HOME=/usr/local/cargo
159
+ENV PATH=$CARGO_HOME/bin:$PATH
160
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
161
+ apt install -y --no-install-recommends cargo
162
+RUN cargo install --locked bindgen-cli
163
+"""
164
+
165
+debian_all_test_cross_compilers = r"""
166
+# extras for cross and alternate toolchains
167
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
168
+ apt install -y --no-install-recommends \
169
+ clang\
170
+ dpkg-dev\
171
+ gdb-multiarch\
172
+ libclang-rt-dev
173
+ENV AVAILABLE_COMPILERS="\
174
+ gcc-aarch64-linux-gnu \
175
+ libc6-dev-arm64-cross \
176
+ gcc-arm-linux-gnueabihf \
177
+ libc6-dev-armhf-cross \
178
+ gcc-alpha-linux-gnu \
179
+ libc6.1-dev-alpha-cross \
180
+ gcc-mips-linux-gnu \
181
+ libc6-dev-mips-cross \
182
+ gcc-mips64-linux-gnuabi64 \
183
+ libc6-dev-mips64-cross \
184
+ gcc-mips64el-linux-gnuabi64 \
185
+ libc6-dev-mips64el-cross \
186
+ gcc-mipsel-linux-gnu \
187
+ libc6-dev-mipsel-cross \
188
+ gcc-powerpc64le-linux-gnu \
189
+ libc6-dev-ppc64el-cross \
190
+ gcc-riscv64-linux-gnu \
191
+ libc6-dev-riscv64-cross \
192
+ gcc-s390x-linux-gnu \
193
+ libc6-dev-s390x-cross\
194
+ gcc-sh4-linux-gnu \
195
+ libc6-dev-sh4-cross \
196
+ "
197
+RUN if dpkg-architecture -e amd64; then \
198
+ export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu libc6-dev-hppa-cross"; \
199
+ export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu libc6-dev-m68k-cross"; \
200
+ export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-powerpc-linux-gnu libc6-dev-powerpc-cross"; \
201
+ export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-powerpc64-linux-gnu libc6-dev-ppc64-cross"; \
202
+ export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-sparc64-linux-gnu libc6-dev-sparc64-cross"; \
203
+fi && \
204
+DEBIAN_FRONTEND=noninteractive eatmydata \
205
+apt install -y --no-install-recommends \
206
+${AVAILABLE_COMPILERS} && \
207
+dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt
208
+ENV QEMU_CONFIGURE_OPTS=--disable-docs
209
+ENV DEF_TARGET_LIST=aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user
210
+"""
211
212
def cross_build(prefix, targets):
213
conf = "ENV QEMU_CONFIGURE_OPTS=--cross-prefix=%s\n" % (prefix)
@@ -223,20 +224,20 @@ try:
224
# Standard native builds
225
#
226
generate_dockerfile("alpine", "alpine-323",
226
- trailer="".join(alpine_extras))
227
+ trailer=alpine_extras)
228
generate_dockerfile("centos9", "centos-stream-9")
229
generate_dockerfile("debian", "debian-13",
229
- trailer="".join(debian13_extras))
230
+ trailer=debian13_extras)
231
generate_dockerfile("fedora", "fedora-43")
232
generate_dockerfile("opensuse-leap", "opensuse-leap-16")
233
generate_dockerfile("ubuntu2404", "ubuntu-2404",
233
- trailer="".join(ubuntu2404_rust_extras))
234
+ trailer=ubuntu2404_rust_extras)
235
236
#
237
# Non-fatal Rust-enabled build
238
#
239
generate_dockerfile("fedora-rust-nightly", "fedora-43",
239
- trailer="".join(fedora_rustup_nightly_extras))
240
+ trailer=fedora_rustup_nightly_extras)
241
242
#
243
# Cross compiling builds
@@ -293,7 +294,7 @@ try:
294
generate_dockerfile("debian-all-test-cross", "debian-13",
295
project="qemu-minimal",
296
enable_rust=False,
296
- trailer="".join(debian_all_test_cross_compilers))
297
+ trailer=debian_all_test_cross_compilers)
298
299
#
300
# GitLab packages lists