From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7227180191860129792 X-Received: by 2002:a92:d0c3:0:b0:326:d02c:c756 with SMTP id y3-20020a92d0c3000000b00326d02cc756mr3741492ila.4.1682709023255; Fri, 28 Apr 2023 12:10:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:1b86:b0:317:979d:93b3 with SMTP id h6-20020a056e021b8600b00317979d93b3ls1583902ili.9.-pod-prod-gmail; Fri, 28 Apr 2023 12:10:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6NKAkIFVq+9vGaIp/TfR9C6Q6l/kkWANlf+sgjHQof7IAs8MwjHio2A6LA++zVPQCDn3xC X-Received: by 2002:a92:c90e:0:b0:328:c3ae:12c6 with SMTP id t14-20020a92c90e000000b00328c3ae12c6mr4312113ilp.9.1682709022754; Fri, 28 Apr 2023 12:10:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682709022; cv=none; d=google.com; s=arc-20160816; b=uQHVTtPrQ8+gm0MvuxXr/0yBGMO0QU8H25tRQMuNZXZ4A+gagTxkV8kEgUGETV2Z9y KoYIl5Xrd3LH09rtNmfEVd5rvc+OWQlMRTkETUpSRz7J6ziGIQNiA6OdjzYNtSfmPLke 2OHKlEtk8e2Akwqi2G4K43/HgQyhjD73s0r4uxkFp41F2S64zi/grAch2Yd7ttp7nydV HnAOSUR7XLwyvfOBT9agBtFdW48jftqgKk51fvl4tb45G4OU+BzzlkOJpSRZb5nW1Tr8 T3NxLa7kb6IR9AmCudUvSWVA8Ss3NDzanF33C1z7xFyA3B/XZzOCyvcLWG9o1nCC4k2Z d1AA== 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=upGWqv3nOwM2TWwrp0/qLLJfpBtt+suX2chDvca4up4=; b=OYKByPGu2vMVw+7R/macMKZPdiWGo0KpdhZB24wD+cHHXncDAvykW7kOkILiHp7Jo9 mibMO2D82t24w70UNVZn7OsOqfCHcUQmwARnh7jgWZhFYgmlM2g5RUcUipCvKAgnVdrX QB/XrkmulOVjSQASB3nit1o49EddC8qm1eHRTtavUh6yzpKUGWr2hrnjQf/sNTNjJBW0 wYoLcLIaW4TzxSNU37WsAAhZYRXQjm32V8W8dypxqoBW86P+/s2o4NfIXleWUcApijfz ySSGpYlgSi+jKtO5F8goDcfF8c/sbLiHWTi1xiYPqzawvnaq/fcFfWzJXFr9OcLsUj1V 1Hbw== 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 v20-20020a056e020f9400b0032e1027cbf4si1288335ilo.1.2023.04.28.12.10.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Apr 2023 12:10:22 -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 33SJA7FE011347 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 21:10:16 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 07/10] CI: Move qemuarm64-bookworm hacks to CI layer Date: Fri, 28 Apr 2023 22:10:01 +0300 Message-Id: <20230428191004.243993-8-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: 8a7Ra8STwNSo 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/qemuarm64-bookworm.conf | 3 --- meta-test/recipes-ci/images/isar-image-ci.bb | 4 ++++ testsuite/citest.py | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf index a04c9d1f..c6b92d2e 100644 --- a/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf +++ b/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf @@ -4,6 +4,3 @@ MACHINE ?= "qemuarm64" DISTRO ?= "debian-bookworm" - -IMAGE_FSTYPES += "wic.xz" -IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb index 0e065efb..16f62998 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -36,3 +36,7 @@ IMAGE_FSTYPES:append:qemuarm:debian-bookworm ?= " wic" WKS_FILE:qemuarm:debian-bookworm ?= "sdimage-efi-sd" IMAGE_INSTALL:append:qemuarm:debian-bookworm ?= " expand-on-first-boot" IMAGER_INSTALL:append:qemuarm:debian-bookworm ?= " ${SYSTEMD_BOOTLOADER_INSTALL}" + +# qemuarm64-bookworm +IMAGE_FSTYPES:append:qemuarm64:debian-bookworm ?= " wic.xz" +IMAGER_INSTALL:append:qemuarm64:debian-bookworm ?= " ${GRUB_BOOTLOADER_INSTALL}" diff --git a/testsuite/citest.py b/testsuite/citest.py index 779d86e2..d49c5c8e 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -158,7 +158,7 @@ class CrossTest(CIBaseTest): def test_cross_bookworm(self): targets = [ 'mc:qemuarm-bookworm:isar-image-ci', - 'mc:qemuarm64-bookworm:isar-image-base' + 'mc:qemuarm64-bookworm:isar-image-ci' ] self.init() @@ -175,7 +175,7 @@ class WicTest(CIBaseTest): :avocado: tags=wic,full """ def test_wic_nodeploy_partitions(self): - targets = ['mc:qemuarm64-bookworm:isar-image-base'] + targets = ['mc:qemuarm64-bookworm:isar-image-ci'] self.init() self.delete_from_build_dir('tmp') @@ -183,7 +183,7 @@ class WicTest(CIBaseTest): wic_deploy_parts=False, debsrc_cache=True, compat_arch=False) def test_wic_deploy_partitions(self): - targets = ['mc:qemuarm64-bookworm:isar-image-base'] + targets = ['mc:qemuarm64-bookworm:isar-image-ci'] self.init() # reuse artifacts -- 2.34.1