From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a92:d091:0:b0:340:809a:2a39 with SMTP id h17-20020a92d091000000b00340809a2a39mr8190105ilh.1.1687241148060; Mon, 19 Jun 2023 23:05:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:1bcd:b0:342:ff1:3d84 with SMTP id x13-20020a056e021bcd00b003420ff13d84ls722330ilv.0.-pod-prod-04-us; Mon, 19 Jun 2023 23:05:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ60+gMQhyxo12UyfDVtgrMgIwew2NGtrbedZMXtUZe9gX+ot0ojne7xTttONX/mQJu1kFcN X-Received: by 2002:a6b:5108:0:b0:76c:4ca6:34d7 with SMTP id f8-20020a6b5108000000b0076c4ca634d7mr11174310iob.19.1687241147258; Mon, 19 Jun 2023 23:05:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687241147; cv=none; d=google.com; s=arc-20160816; b=o82Pys8V7o5zeiIkClPkSqmyd36Gg50Pq38lMmEVAy3SPXdYczYl0Y7Mj8Z4y3MTKH RMW85k+TCoFLyCUkUmF86FrgbQDlwzkVwk2nQOXm4l9oDoqA3Omf2FxwCU0JoffQphbX eI8zW95Oaiaio1uBN+Qua5mN9QY8i0bqfabA45+RkZkTzWZR9KZYfDvSv/zfrS0aza0A HdJIODgRKyagX9Cwog52nN8PMnO2k82uf1sxlL3ElqsCUuu43QkyKrj6tPxsmACyEbFx TDPDLGRWPcI4QLZUhrS5AIfN3tuMwBlwDYZGA430ohpD/j8wXFrJT7wh/JHaNGfJ4wjl i/dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=vMZfGTguNYonW8DgParJ5C1SSaEJDjV8AEUBfY1tXQI=; b=bJTJNJbghqNyqc5wZNxhy/SpJlk5svSZVNEEnDKbSdbJfc16n9JEQOz8+UV1aLQBa9 Z57u2tZzL4CScp23m/MEx6UIoho8crKvhDaJpZoirJ/vhwjzYpeAEIpPsIfm4EsNYN2w orbH3iP1Bls0cqOWSy/inJa55xVN5LhmA2Zruvo6zhGXCy4fio1ed1FHo7NeUOjFUVpi lmlT1jhCK3fDzvLA+9ZhJXHuO1s8IxA533P7qU+CebFqb4pPdcDHwzcF61ODk/dyh30g miFQyZYLywxjjR/c582tisyVLIAxzJVSJDLykI0TxXlPuM20E18KadJF6mLHtSf+B+f6 M7pw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bn7-20020a0566021a8700b0077e2adb47adsi101132iob.2.2023.06.19.23.05.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Jun 2023 23:05:47 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 35K65iXt027569 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 20 Jun 2023 08:05:44 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 00/12] Move testsuite hacks to separate layer Date: Tue, 20 Jun 2023 08:05:32 +0200 Message-Id: <20230620060544.19745-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: 61nlv6DNWLAX 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. 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%) -- 2.20.1