Re: [PATCH v4 00/12] Move testsuite hacks to separate layer

[Uladzimir Bely <ubely@ilbers.de>]

On Wed, 2023-06-21 at 15:49 +0200, Henning Schild wrote:
> Am Tue, 20 Jun 2023 08:05:32 +0200
> schrieb Uladzimir Bely <ubely@ilbers.de>:
> 
> > There are a lot of hacks in Isar are used by testsuite only. Some
> > of
> > them even cause variable setting issues for users. To prevent this
> > kind of issues introduce separate meta-test layer to be used by
> > testsuite only.
> 
> I always disliked all the QEMU_ variables in the machine configs.
> Because they are really only relevant for isar ci and whether they
> should be written down in bitbake is questionable, now that we clean
> up
> i recommend moving that out as well.
> 

AEMU_ variables are not only used for CI, but also for manual running
the compiled image (scripts/start_vm or testsuite/start_vm.py). At
least, having them in machine configs means having an example of qemu
run arguments, even if used won't use the scripts.

I would say, we should have in machine configs everything we need to
successfully compile and boot the image (similar to installing uboot-
related packages for some hardware targets).

> Henning
> 
> > This patchset also removes variables setting from multiconfigs to
> > allow building without multiconfigs.
> > The current patchset version is not fully tested and lack some
> > documentation, but it should be a good starting point.
> > 
> > Changes since v3:
> > - Cleanup machine configs from IMAGE_INSTALL and IMAGE_PREINSTALL
> > entries that are not related to machine configuration.
> > - Base qemuamd64-sb config on qemuamd64 one.
> > 
> > Changes since v2:
> > - Fix warnings from bitbake during parsing multiconfigs by making
> > files from `meta-isar/recipes-core/images` visible for isar-image-
> > ci.
> > 
> > Changes since v1:
> > - Rebased on latest `next`.
> > - Added RECIPE-API-CHANGELOG.md entry.
> > 
> > The patchset is additionally tested with `meta-iot2050` downstream.
> > 
> > Anton Mikanovich (10):
> >   CI: Introduce meta-test layer
> >   ubuntu: Fix WKS_FILE overriding
> >   CI: Move qemuamd64-bookworm hacks to CI layer
> >   CI: Move qemuamd64-bullseye hacks to CI layer
> >   CI: Move qemuamd64-buster hacks to CI layer
> >   CI: Move qemuarm-bookworm hacks to CI layer
> >   CI: Move qemuarm64-bookworm hacks to CI layer
> >   meta-isar: Remove qemuamd64-sb settings from multiconfig
> >   meta-isar: Remove imx6-sabrelite settings from multiconfig
> >   meta-isar: Unify multiconfigs to use weak assignments
> > 
> > Uladzimir Bely (2):
> >   meta-isar: Cleanup machine configs
> >   meta-isar: Base qemuamd64-sb config on qemuamd64
> > 
> >  RECIPE-API-CHANGELOG.md                       | 13 +++
> >  meta-isar/conf/distro/ubuntu-common.inc       |  2 +
> >  meta-isar/conf/local.conf.sample              |  5 +
> >  meta-isar/conf/machine/imx6-sabrelite.conf    |  4 +
> >  meta-isar/conf/machine/phyboard-mira.conf     |  1 -
> >  meta-isar/conf/machine/qemuamd64-sb.conf      | 23 ++---
> >  meta-isar/conf/machine/qemuamd64.conf         | 15 ---
> >  meta-isar/conf/machine/rpi-common.conf        | 17 +---
> >  .../conf/machine/starfive-visionfive2.conf    |  3 -
> >  meta-isar/conf/machine/virtualbox.conf        |  1 -
> >  meta-isar/conf/machine/vmware.conf            |  1 -
> >  .../conf/multiconfig/bananapi-bullseye.conf   |  4 +-
> >  .../conf/multiconfig/bananapi-buster.conf     |  4 +-
> >  .../multiconfig/de0-nano-soc-bullseye.conf    |  4 +-
> >  .../conf/multiconfig/de0-nano-soc-buster.conf |  4 +-
> >  .../conf/multiconfig/hikey-bookworm.conf      |  4 +-
> >  .../conf/multiconfig/hikey-bullseye.conf      |  4 +-
> >  .../multiconfig/imx6-sabrelite-bullseye.conf  |  6 --
> >  .../multiconfig/imx6-sabrelite-buster.conf    |  6 --
> >  .../conf/multiconfig/nanopi-neo-bullseye.conf |  4 +-
> >  .../conf/multiconfig/nanopi-neo-buster.conf   |  4 +-
> >  .../conf/multiconfig/qemuamd64-bookworm.conf  |  1 -
> >  .../conf/multiconfig/qemuamd64-bullseye.conf  |  2 -
> >  .../conf/multiconfig/qemuamd64-buster.conf    |  4 -
> >  .../conf/multiconfig/qemuamd64-focal.conf     |  2 -
> >  .../conf/multiconfig/qemuamd64-jammy.conf     |  2 -
> >  .../multiconfig/qemuamd64-sb-bullseye.conf    | 11 +--
> >  .../conf/multiconfig/qemuarm-bookworm.conf    |  6 --
> >  .../conf/multiconfig/qemuarm64-bookworm.conf  |  3 -
> >  .../multiconfig/sifive-fu540-sid-ports.conf   |  4 +-
> >  .../starfive-visionfive2-sid-ports.conf       |  4 +-
> >  .../conf/multiconfig/stm32mp15x-bullseye.conf |  4 +-
> >  .../conf/multiconfig/stm32mp15x-buster.conf   |  4 +-
> >  .../conf/multiconfig/virtualbox-bullseye.conf |  5 +-
> >  meta-isar/recipes-ci/images/isar-image-ci.bb  |  9 --
> >  meta-test/conf/bblayers.conf.sample           | 18 ++++
> >  meta-test/conf/conf-notes.txt                 |  3 +
> >  meta-test/conf/layer.conf                     | 20 ++++
> >  meta-test/conf/local.conf.sample              | 95
> > +++++++++++++++++++ meta-test/recipes-ci/images/isar-image-ci.bb  |
> > 51 ++++++++++ .../isar-ci-ssh-setup/files/postinst          |  0
> >  .../isar-ci-ssh-setup_0.1.bb                  |  0
> >  testsuite/cibuilder.py                        |  1 +
> >  testsuite/citest.py                           | 32 ++++---
> >  44 files changed, 274 insertions(+), 136 deletions(-)
> >  delete mode 100644 meta-isar/recipes-ci/images/isar-image-ci.bb
> >  create mode 100644 meta-test/conf/bblayers.conf.sample
> >  create mode 100644 meta-test/conf/conf-notes.txt
> >  create mode 100644 meta-test/conf/layer.conf
> >  create mode 100644 meta-test/conf/local.conf.sample
> >  create mode 100644 meta-test/recipes-ci/images/isar-image-ci.bb
> >  rename {meta-isar =>
> > meta-test}/recipes-ci/isar-ci-ssh-setup/files/postinst (100%)
> > rename
> > {meta-isar =>
> > meta-test}/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb
> > (100%)
> > 
>