From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a05:6214:27c9:b0:625:99ee:3ad8 with SMTP id ge9-20020a05621427c900b0062599ee3ad8mr13576057qvb.31.1687241150710; Mon, 19 Jun 2023 23:05:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:5903:0:b0:62f:fb47:5672 with SMTP id ez3-20020ad45903000000b0062ffb475672ls1101891qvb.1.-pod-prod-07-us; Mon, 19 Jun 2023 23:05:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ZnSiJfRjSBTAdrlttVuf4UUNIG3t1nDP4B1JdR5KVROS1T71h8yA7Jn2ggwzJb8dp+6eq X-Received: by 2002:a67:e28e:0:b0:43f:5b4d:b6f6 with SMTP id g14-20020a67e28e000000b0043f5b4db6f6mr3269783vsf.35.1687241150089; Mon, 19 Jun 2023 23:05:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687241150; cv=none; d=google.com; s=arc-20160816; b=F5H68SdYVqI9qMnNs6B+wU5myn4qQSW9PJwUPDWRES6A1Za6wiqhbZGpe01xveSxlq UPhswUKrtX6pH4/thAa+1npfiX5oHs9Kw+w7SdJmhCRJBoajCG8p3pUsjZqzJzLiTjbU 7dNbLpxB3wGzEsNyxqGzjmYJDHA6KLM6KOuwplZPTt3NP8UEbGDfx7XkyXrlzCNFivr/ zldTERWJEZ6wgcLERr9DwwavqCcawS63EXbzO4J4rdwWfJfKu2J4j9FhHh45BhLpA73H YkwtVvP1eEVvWgmL1nOk92EGEZxpfGjT/KpgEckJDl0SY39P2BJCl8eVzE57YiGuz4Ga KjBg== 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=oF21HepU7pAuRHoAIcJfXsVbSIhYrtpvsdwTifKbFhU=; b=SVtjYCQ+JZq1viE4mKp3DE+yOTNcMtrugES8O9eiBV5vzya3g/aZvqZmiAoIYZebLd j8ETkExSXrpzf0oFkTsa5o3YofC96UhknDY98NngztcygqhknOKSIpbw5xfJ4kDvUlRl 29sk8QZUqBWTgN1zjPwQLGWCrFArjxddMRhnrqWo5ukMMnxMQoItROOp4PU8Gibo3zRR ptI3EXPCP+/B6tlXqV2Czy2eI+TIlp3xKFs/awqfYrdMEtVaInVByWrHUJQi2+YxHAQ2 xCQIdR7PPojqdbPQIuncazjW+kxALxi850KJyJ/XnrBKaOvEvBEkPFOwEP3bg0+mRMqk cjxg== 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 s11-20020a056130020b00b007876a39a37dsi108272uac.0.2023.06.19.23.05.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Jun 2023 23:05:50 -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 35K65iY2027569 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 20 Jun 2023 08:05:47 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 07/12] CI: Move qemuarm64-bookworm hacks to CI layer Date: Tue, 20 Jun 2023 08:05:39 +0200 Message-Id: <20230620060544.19745-8-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: t/Rh8mvO++U4 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/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 714e4d73..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:append = " 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 65822599..733f7204 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -43,3 +43,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.20.1