On Thu, 17 Nov 2022, Michal Orzel wrote:
> Installation of additional packages from the test scripts when running
> the tests has some drawbacks. It is slower than cloning containers and can
> fail due to some network issues (apparently it often happens on x86
> rackspace). This patch is adding the packages required by the tests to be
> installed when building the containers.
>
> >From qemu-alpine-x86_64.sh into debian:stretch:
> - cpio,
> - busybox-static.
>
> >From qemu-smoke-*-{arm,arm64}.sh into debian:unstable-arm64v8:
> - u-boot-qemu,
> - u-boot-tools,
> - device-tree-compiler,
> - curl,
> - cpio,
> - busybox-static.
>
> The follow-up patch will remove installation of these packages from the
> test scripts. This is done in order not to break the CI in-between.
>
> Signed-off-by: Michal Orzel <[email protected]>
Reviewed-by: Stefano Stabellini <[email protected]>
> ---
> automation/build/debian/stretch.dockerfile | 3 +++
> automation/build/debian/unstable-arm64v8.dockerfile | 7 +++++++
> 2 files changed, 10 insertions(+)
>
> diff --git a/automation/build/debian/stretch.dockerfile
> b/automation/build/debian/stretch.dockerfile
> index da6aa874dd70..30fcc5288dee 100644
> --- a/automation/build/debian/stretch.dockerfile
> +++ b/automation/build/debian/stretch.dockerfile
> @@ -49,6 +49,9 @@ RUN apt-get update && \
> apt-transport-https \
> # for test phase, qemu-smoke-* jobs
> qemu-system-x86 \
> + # for test phase, qemu-alpine-* jobs
> + cpio \
> + busybox-static \
> && \
> apt-get autoremove -y && \
> apt-get clean && \
> diff --git a/automation/build/debian/unstable-arm64v8.dockerfile
> b/automation/build/debian/unstable-arm64v8.dockerfile
> index 5c73458d9d19..0080c22ba21f 100644
> --- a/automation/build/debian/unstable-arm64v8.dockerfile
> +++ b/automation/build/debian/unstable-arm64v8.dockerfile
> @@ -43,6 +43,13 @@ RUN apt-get update && \
> wget \
> git \
> nasm \
> + # for test phase, qemu-smoke-* jobs
> + u-boot-qemu \
> + u-boot-tools \
> + device-tree-compiler \
> + curl \
> + cpio \
> + busybox-static \
> && \
> apt-get autoremove -y && \
> apt-get clean && \
> --
> 2.25.1
>
