ci: xen guest and host testing

From: Jon Mason <jon.mason@arm.com>

Add the ability to run testimage on xen guest images (not xen testing),
and add xen host testimage for qemuarm.
NOTE: xen yml files must come after testing yml file due to the order of
the sshd entry (and xen requires openssh).

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
b4 test email
---
 .gitlab-ci.yml                                      | 9 +++++----
 ci/xen-guest.yml                                    | 7 +++++++
 ci/xen.yml                                          | 2 ++
 meta-arm/recipes-kernel/linux/files/xen-nopci.cfg   | 7 +++++++
 meta-arm/recipes-kernel/linux/linux-yocto%.bbappend | 2 ++
 5 files changed, 23 insertions(+), 4 deletions(-)


---
base-commit: c2d0905b51ff267839d1482640d913ccfa3bae63
change-id: 20230705-jdm-xen-c783ce5e2acd

Best regards,

DISREGARD this email.  It is a test using b4 to send without an SMTP server

On Wed, Jul 5, 2023 at 2:10 PM Jon Mason <jon.mason@arm.com> wrote:
>
> From: Jon Mason <jon.mason@arm.com>
>
> Add the ability to run testimage on xen guest images (not xen testing),
> and add xen host testimage for qemuarm.
> NOTE: xen yml files must come after testing yml file due to the order of
> the sshd entry (and xen requires openssh).
>
> Signed-off-by: Jon Mason <jon.mason@arm.com>
> ---
> b4 test email
> ---
>  .gitlab-ci.yml                                      | 9 +++++----
>  ci/xen-guest.yml                                    | 7 +++++++
>  ci/xen.yml                                          | 2 ++
>  meta-arm/recipes-kernel/linux/files/xen-nopci.cfg   | 7 +++++++
>  meta-arm/recipes-kernel/linux/linux-yocto%.bbappend | 2 ++
>  5 files changed, 23 insertions(+), 4 deletions(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 1433d2ac43c3..8f5312c35998 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -82,15 +82,15 @@ update-repos:
>  #
>  # Build stage, the actual build jobs
>  #
> -# Available options for building are
> +# Available options for building are (VIRT _must_ be last for ssh override)
>  #  DISTRO: [poky, poky-tiny]
>  #  KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
>  #  TOOLCHAINS: [gcc, clang, external-gccarm]
>  #  TCLIBC: [glibc, musl]
>  #  FIRMWARE: [u-boot, edk2]
>  #  TS: [none, trusted-services]
> -#  VIRT: [none, xen]
>  #  TESTING: testimage
> +#  VIRT: [none, xen, xen-guest]
>
>  corstone500:
>    extends: .build
> @@ -180,7 +180,7 @@ qemuarm64:
>          TESTING: testimage
>        - DISTRO: poky-tiny
>          TESTING: testimage
> -      - VIRT: xen
> +        VIRT: [none, xen, xen-guest]
>
>  qemuarm-secureboot:
>    extends: .build
> @@ -204,7 +204,7 @@ qemuarm:
>          TESTING: testimage
>        - DISTRO: poky-tiny
>          TESTING: testimage
> -      - VIRT: xen
> +        VIRT: [none, xen, xen-guest]
>
>  qemuarmv5:
>    extends: .build
> @@ -213,6 +213,7 @@ qemuarmv5:
>        - DISTRO: poky
>          KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
>          TESTING: testimage
> +        VIRT: [none, xen, xen-guest]
>        - DISTRO: poky-tiny
>          TESTING: testimage
>
> diff --git a/ci/xen-guest.yml b/ci/xen-guest.yml
> new file mode 100644
> index 000000000000..d53eb4d09d52
> --- /dev/null
> +++ b/ci/xen-guest.yml
> @@ -0,0 +1,7 @@
> +header:
> +  version: 11
> +  includes:
> +    - ci/xen.yml
> +
> +target:
> +  - xen-guest-image-minimal
> diff --git a/ci/xen.yml b/ci/xen.yml
> index f4a8f9a453ad..a68eebfe5589 100644
> --- a/ci/xen.yml
> +++ b/ci/xen.yml
> @@ -6,6 +6,8 @@ header:
>  local_conf_header:
>    meta-virt: |
>      DISTRO_FEATURES:append = " virtualization xen"
> +  sshd: |
> +    IMAGE_FEATURES:append = " ssh-server-openssh"
>
>  target:
>    - xen-image-minimal
> diff --git a/meta-arm/recipes-kernel/linux/files/xen-nopci.cfg b/meta-arm/recipes-kernel/linux/files/xen-nopci.cfg
> new file mode 100644
> index 000000000000..043c74295022
> --- /dev/null
> +++ b/meta-arm/recipes-kernel/linux/files/xen-nopci.cfg
> @@ -0,0 +1,7 @@
> +CONFIG_PCI=n
> +CONFIG_PCI_HOST_GENERIC=n
> +CONFIG_HOTPLUG_PCI=n
> +CONFIG_PCIEPORTBUS=n
> +CONFIG_PCI_MSI=n
> +
> +CONFIG_PERF_EVENTS=n
> diff --git a/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
> index 3f2c83fd624f..7234c196255b 100644
> --- a/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
> +++ b/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
> @@ -36,6 +36,8 @@ SRC_URI:append:qemuarm = " \
>      file://efi.cfg \
>      file://qemuarm-phys-virt.cfg \
>      "
> +SRC_URI:append:qemuarm = " ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'file://xen-nopci.cfg', '' , d)}"
> +KERNEL_FEATURES:remove:qemuarm = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'features/drm-bochs/drm-bochs.scc', '' , d)}"
>
>  FFA_TRANSPORT_INCLUDE = "${@bb.utils.contains('MACHINE_FEATURES', 'arm-ffa', 'arm-ffa-transport.inc', '' , d)}"
>  require ${FFA_TRANSPORT_INCLUDE}
>
> ---
> base-commit: c2d0905b51ff267839d1482640d913ccfa3bae63
> change-id: 20230705-jdm-xen-c783ce5e2acd
>
> Best regards,
> --
> Jon Mason <jon.mason@arm.com>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#4856): https://lists.yoctoproject.org/g/meta-arm/message/4856
> Mute This Topic: https://lists.yoctoproject.org/mt/99970245/3616920
> Group Owner: meta-arm+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/leave/7218881/3616920/1111825316/xyzzy [jdmason@kudzu.us]
> -=-=-=-=-=-=-=-=-=-=-=-
>