From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7227180191860129792 X-Received: by 2002:a05:6a00:1625:b0:63b:5496:7af7 with SMTP id e5-20020a056a00162500b0063b54967af7mr1668498pfc.2.1682709020387; Fri, 28 Apr 2023 12:10:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:f803:b0:199:50f5:6729 with SMTP id ix3-20020a170902f80300b0019950f56729ls5554449plb.11.-pod-prod-gmail; Fri, 28 Apr 2023 12:10:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6E5hGz10eRSTYDhIQLb4zpit7P3H7nGptGvgbP2cnh/lLzTj2AwrrgT/59wR0oOh4tCPC9 X-Received: by 2002:a05:6a20:4412:b0:f2:a0d1:af6c with SMTP id ce18-20020a056a20441200b000f2a0d1af6cmr8465894pzb.0.1682709019527; Fri, 28 Apr 2023 12:10:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682709019; cv=none; d=google.com; s=arc-20160816; b=sFg5z3+1N+kj+Lw1m8OiIEWfQRE69xfG1yDkMd9U3ns+/g6ag7FAAUqeG3ZaiDLaDH uRdM2uMv+XQ8aln/JqVC3O/PMrxbbo+5PamnRAEGLiq+bfPq8/2ZencKtgxv1fU7jUX4 jQTMVG1i1TV3JuND6KMvP7egf9mO9YeXMCM2D3LKGdkvnz0RIhAMgYTctSs5Jd4smPPU wjljFwo/YdzuTRhGPN10IG+4NyGcZM5HlNEp/3IHkG2MOQrWSRPo515SB5skOK/z9HdX Yo4zVV8vhL9U0SRnYCLDg9aBTlsFIL2WWqEbJI9jahXuoRTUBVvQFRhkn13vd8VsXq0D 5c5g== 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:cc:to:from; bh=Kw4brs3qGQvvthxBoRxlwGkCMWbAKfYUQR5MHrn+mpk=; b=OKKchPWVFhNmwoNO7ArMXZNa1HLCT1lePeNiK6KVbPuVuVaVMAvE3uHcnb3SPdeu5Z cks5Qcn2wQgHItgdxF8Kio7PcrmmE8OU8PvXYNMmmVjmFHOi79Km0r/XwGzMeWKwWi0A PT8y0EbdLw/M1wb2svVsR60P00N8DRuZlZTHtjOf8CRrMzUsBzGu3a2CFbDnmpwV9LdL pJSyJkZez0Xm0yOtnW9R+msMwkLsDwuAzvbvsJ3aMeVqjFcL6OjkbKB1x7SKp9HuZ1uC JuPobkN/twMwMd4LVfoNgKXmhGr2TS6deO+WcDnFpnEuHr1jliOSB9hTmktHZN5a9eJH d6Aw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id b21-20020a656695000000b0052875a200fcsi483827pgw.2.2023.04.28.12.10.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Apr 2023 12:10:19 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.com (IN-213-226-141-183.bitemobile.lv [213.226.141.183] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 33SJA7FC011347 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 21:10:14 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 05/10] CI: Move qemuamd64-buster hacks to CI layer Date: Fri, 28 Apr 2023 22:09:59 +0300 Message-Id: <20230428191004.243993-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230428191004.243993-1-amikan@ilbers.de> References: <20230428191004.243993-1-amikan@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: itdGLl5cCnHF 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/multiconfig/qemuamd64-buster.conf | 4 ---- meta-test/recipes-ci/images/isar-image-ci.bb | 5 +++++ testsuite/citest.py | 8 +++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index 79d0aa63..3fabd675 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -2,7 +2,3 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-buster" -WKS_FILE ?= "efi-plus-pcbios.wks" -IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" - -IMAGE_FSTYPES ?= "wic ext4" diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb index 59d83ccf..94444062 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -21,6 +21,11 @@ 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-buster +IMAGE_FSTYPES:qemuamd64:debian-buster ?= "wic ext4" +WKS_FILE:qemuamd64:debian-buster ?= "efi-plus-pcbios" +IMAGER_INSTALL:append:qemuamd64:debian-buster ?= " ${SYSLINUX_BOOTLOADER_INSTALL}" + # 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 4e6bf333..7751d54a 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -204,7 +204,7 @@ class NoCrossTest(CIBaseTest): 'mc:qemuarm64-bullseye:isar-image-ci', 'mc:qemui386-buster:isar-image-base', 'mc:qemui386-bullseye:isar-image-base', - 'mc:qemuamd64-buster:isar-image-base', + 'mc:qemuamd64-buster:isar-image-ci', 'mc:qemuamd64-bullseye:isar-initramfs', 'mc:qemumipsel-buster:isar-image-base', 'mc:qemumipsel-bullseye:isar-image-base', @@ -432,9 +432,11 @@ class VmBootTestFull(CIBaseTest): def test_amd64_buster(self): self.init() # test efi boot - self.vm_start('amd64','buster') + self.vm_start('amd64','buster', \ + image='isar-image-ci') # test pcbios boot - self.vm_start('amd64', 'buster', True) + self.vm_start('amd64', 'buster', True, \ + image='isar-image-ci') def test_amd64_focal(self): self.init() -- 2.34.1