From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a17:90b:1057:b0:258:ebb3:932 with SMTP id gq23-20020a17090b105700b00258ebb30932mr8617391pjb.3.1687241150365; Mon, 19 Jun 2023 23:05:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:dc04:b0:250:af56:cc86 with SMTP id i4-20020a17090adc0400b00250af56cc86ls3505251pjv.1.-pod-prod-03-us; Mon, 19 Jun 2023 23:05:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4GIHMu0S8XIH2B3UqHvGWk8pmqKZKmup0hdQ1elPUmbX3bML1HfkD5rjb43TJ/JiNhdTW3 X-Received: by 2002:a05:6a20:4fa3:b0:117:eaef:53 with SMTP id gh35-20020a056a204fa300b00117eaef0053mr13809143pzb.35.1687241149373; Mon, 19 Jun 2023 23:05:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687241149; cv=none; d=google.com; s=arc-20160816; b=wwBIdNI34/O8N3iHQPfk6qNvAesW7FPBEJJ2+i29t42zZAdLnf9D+Eo142hZdqJ/07 kRVUIaYMFRvplweytdLHTCOZcTQk5Mrs9SwfSuKpOVBzbbhfS8a5tCzLIY7r/gMxSsS4 +nh7pvj6/QY9HYLTZkjDLwZspT6qx7S7/x8FSN15oSO1Yw/i+5aMP2Y/WikLGMV0XFHF 7mwzFCgM5lDCoCfuHe3oZ9uNLDdzfq5/t4+B60eG6gn6iak+R0Y6SXc0EW1FdxzXva8r Jnwbj6tfbsBdVcRfSdv903CT+6JbXJg1bUehnE/UH6H+iXUd5BwUnzpJadTcLaddTxfG YppQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=wfOblPYm+sOKKMWAYDNaiIwsCY9XsCCT9yQfWWXZ190=; b=AZAi0wN/2BUkJzJxbK0R0XnsL5K908n52z3NeH3PEhue4my0kTGoiZp7IjG2nocMcC 9OBZ3M4fP3gM04L7D3QuUwlzRX6rvqmSqXoLJcRQeIuA0e9CwUmXqLZncW9BwXmjrLE0 iswZd0wYQPcSVaC9R+qwQyorK91DlHRJpGaBjWN06+onH3nRTWDLvAyO2JupEinR5The 2sHEg7zkbAh2m1Ic+W+me/gUw74RDpowWriy/u7gWMXpdWoAuiRG8UPIXnCOmxWevB/d CizvfHFDZU/3V1SpkabouoY9PDl5mvNqzB62DBP8UdxSX0tWnQI+YzaOGJ1sd5ky8s3/ pK0g== 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 kf7-20020a17090305c700b001b3f80b067fsi95200plb.4.2023.06.19.23.05.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Jun 2023 23:05:49 -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 35K65iXx027569 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 20 Jun 2023 08:05:46 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 04/12] CI: Move qemuamd64-bullseye hacks to CI layer Date: Tue, 20 Jun 2023 08:05:36 +0200 Message-Id: <20230620060544.19745-5-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230620060544.19745-1-ubely@ilbers.de> References: <20230620060544.19745-1-ubely@ilbers.de> 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: 44q1XRBWpUCz From: Anton Mikanovich To enable setting CI-related config in testsuite only move it from meta-isar to meta-test layer. Also change testsuite to use new image. Signed-off-by: Anton Mikanovich --- meta-isar/conf/machine/qemuamd64.conf | 5 ----- meta-isar/conf/multiconfig/qemuamd64-bullseye.conf | 2 -- meta-test/recipes-ci/images/isar-image-ci.bb | 7 +++++++ testsuite/citest.py | 9 +++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index c02b3860..cdee9bdd 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -9,11 +9,6 @@ IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" -WKS_FILE:debian-bullseye ?= "sdimage-efi-btrfs" -IMAGER_INSTALL:remove:debian-bullseye = "${GRUB_BOOTLOADER_INSTALL}" -IMAGER_INSTALL:append:debian-bullseye = " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs" -IMAGE_PREINSTALL:append:debian-bullseye = " btrfs-progs" - IMAGE_INSTALL += "sshd-regen-keys" IMAGE_INSTALL += "expand-on-first-boot" diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf index 1c1326cd..1badc889 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf @@ -2,5 +2,3 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-bullseye" - -IMAGE_FSTYPES:append = " cpio.gz tar.gz" diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb index 4ef1333b..ad7560af 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -16,6 +16,13 @@ IMAGE_INSTALL += "isar-ci-ssh-setup" # qemuamd64-bookworm WKS_FILE:qemuamd64:debian-bookworm ?= "multipart-efi.wks" +# qemuamd64-bullseye +IMAGE_FSTYPES:append:qemuamd64:debian-bullseye ?= " cpio.gz tar.gz" +WKS_FILE:qemuamd64:debian-bullseye ?= "sdimage-efi-btrfs" +IMAGER_INSTALL:remove:qemuamd64:debian-bullseye ?= "${GRUB_BOOTLOADER_INSTALL}" +IMAGER_INSTALL:append:qemuamd64:debian-bullseye ?= " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs" +IMAGE_PREINSTALL:append:qemuamd64:debian-bullseye ?= " btrfs-progs" + # qemuamd64-focal WKS_FILE:qemuamd64:ubuntu-focal ?= "sdimage-efi-sd" IMAGER_INSTALL:remove:qemuamd64:ubuntu-focal ?= "${GRUB_BOOTLOADER_INSTALL}" diff --git a/testsuite/citest.py b/testsuite/citest.py index e4b36519..4e6bf333 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -26,7 +26,7 @@ class DevTest(CIBaseTest): """ def test_dev(self): targets = [ - 'mc:qemuamd64-bullseye:isar-image-base', + 'mc:qemuamd64-bullseye:isar-image-ci', 'mc:qemuarm-bullseye:isar-image-base', 'mc:qemuarm-bullseye:isar-image-base:do_populate_sdk', 'mc:qemuarm64-bullseye:isar-image-base' @@ -37,7 +37,7 @@ class DevTest(CIBaseTest): def test_dev_apps(self): targets = [ - 'mc:qemuamd64-bullseye:isar-image-base', + 'mc:qemuamd64-bullseye:isar-image-ci', 'mc:qemuarm64-bullseye:isar-image-base' ] @@ -55,13 +55,14 @@ class DevTest(CIBaseTest): file.write('do_fetch:append() {\n\n}') try: - self.perform_build_test('mc:qemuamd64-bullseye:isar-image-base') + self.perform_build_test('mc:qemuamd64-bullseye:isar-image-ci') finally: self.restorefile(dpkgbase_file) def test_dev_run_amd64_bullseye(self): self.init() - self.vm_start('amd64', 'bullseye') + self.vm_start('amd64', 'bullseye', \ + image='isar-image-ci') def test_dev_run_arm64_bullseye(self): self.init() -- 2.20.1