Re: [PATCH 4/6] CI: Express HYPERVISOR_ONLY in build.yml

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Fri, 30 Dec 2022, Andrew Cooper wrote:

> Whether to build only Xen, or everything, is a property of container,
> toolchain and/or testcase.  It is not a property of XEN_TARGET_ARCH.
> 
> Capitalise HYPERVISOR_ONLY and have it set by the debian-unstable-gcc-arm32-*
> testcases at the point that arm32 get matched with a container that can only
> build Xen.
> 
> For simplicity, retain the RANDCONFIG -> HYPERVISOR_ONLY implication.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> ---
> CC: Doug Goldstein <cardoe@xxxxxxxxxx>
> CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> CC: Anthony PERARD <anthony.perard@xxxxxxxxxx>
> CC: Michal Orzel <michal.orzel@xxxxxxx>
> CC: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
> ---
>  automation/gitlab-ci/build.yaml |  2 ++
>  automation/scripts/build        | 11 ++++-------
>  2 files changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
> index 93d9ff69a9f2..e6a9357de3ef 100644
> --- a/automation/gitlab-ci/build.yaml
> +++ b/automation/gitlab-ci/build.yaml
> @@ -516,11 +516,13 @@ debian-unstable-gcc-arm32:
>    extends: .gcc-arm32-cross-build
>    variables:
>      CONTAINER: debian:unstable-arm32-gcc
> +    HYPERVISOR_ONLY: y
>  
>  debian-unstable-gcc-arm32-debug:
>    extends: .gcc-arm32-cross-build-debug
>    variables:
>      CONTAINER: debian:unstable-arm32-gcc
> +    HYPERVISOR_ONLY: y

can you move the setting of HYPERVISOR_ONLY to .arm32-cross-build-tmpl ?

I think that makes the most sense because .arm32-cross-build-tmpl is the
one setting XEN_TARGET_ARCH and also the x86_64 tag.

>  
>  debian-unstable-gcc-arm32-randconfig:
>    extends: .gcc-arm32-cross-build
> diff --git a/automation/scripts/build b/automation/scripts/build
> index f2301d08789d..4c6d1f3b70bc 100755
> --- a/automation/scripts/build
> +++ b/automation/scripts/build
> @@ -19,7 +19,9 @@ if [[ "${RANDCONFIG}" == "y" ]]; then
>      fi
>  
>      make -j$(nproc) -C xen KCONFIG_ALLCONFIG=tools/kconfig/allrandom.config 
> randconfig
> -    hypervisor_only="y"
> +
> +    # RANDCONFIG implies HYPERVISOR_ONLY
> +    HYPERVISOR_ONLY="y"
>  else
>      echo "CONFIG_DEBUG=${debug}" > xen/.config
>  
> @@ -34,15 +36,10 @@ fi
>  # to exit early -- bash is invoked with -e.
>  cp xen/.config xen-config
>  
> -# arm32 only cross-compiles the hypervisor
> -if [[ "${XEN_TARGET_ARCH}" = "arm32" ]]; then
> -    hypervisor_only="y"
> -fi
> -
>  # Directory for the artefacts to be dumped into
>  mkdir binaries
>  
> -if [[ "${hypervisor_only}" == "y" ]]; then
> +if [[ "${HYPERVISOR_ONLY}" == "y" ]]; then
>      # Xen-only build
>      make -j$(nproc) xen
>  
> -- 
> 2.11.0
>