cpio needs to be in Tools (general) now that it's used by the general build
script. Merge the rest of the test phase jobs into one group, to avoid being
overly fine-grain.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Denis Mukhin <dmukhin@ford.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Julien Grall <julien@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Shawn Anastasio <sanastasio@raptorengineering.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Victor Lira <victorm.lira@amd.com>
Prep for making a Debian Trixie derivative.
v3:
* New
---
automation/build/debian/12-x86_64.dockerfile | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/automation/build/debian/12-x86_64.dockerfile b/automation/build/debian/12-x86_64.dockerfile
index 3cf99c730b61..4e533ee879fd 100644
--- a/automation/build/debian/12-x86_64.dockerfile
+++ b/automation/build/debian/12-x86_64.dockerfile
@@ -23,6 +23,7 @@ RUN <<EOF
# Tools (general)
ca-certificates
+ cpio
git-core
pkg-config
wget
@@ -52,19 +53,14 @@ RUN <<EOF
ocaml-nox
ocaml-findlib
- # for test phase, qemu-smoke-* jobs
+ # for test phase, qemu-* jobs
+ busybox-static
expect
+ ovmf
qemu-system-x86
# for build-each-commit-gcc
ccache
-
- # for qemu-alpine-x86_64-gcc
- busybox-static
- cpio
-
- # For *-efi jobs
- ovmf
)
apt-get -y --no-install-recommends install "${DEPS[@]}"
--
2.39.5