From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7227180191860129792 X-Received: by 2002:a05:6214:9af:b0:5ef:5726:ba25 with SMTP id du15-20020a05621409af00b005ef5726ba25mr1287901qvb.0.1682709020321; Fri, 28 Apr 2023 12:10:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:4142:0:b0:616:4dcb:48d5 with SMTP id z2-20020ad44142000000b006164dcb48d5ls3671826qvp.9.-pod-prod-gmail; Fri, 28 Apr 2023 12:10:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4dIxKwfTBCHd3kJvX5xvNNbTOAo9JTqbrmHpoinn0oJwvNo5oWnc0hLpcOXB21jak+e7sO X-Received: by 2002:a05:6214:29c9:b0:5ef:33af:762 with SMTP id gh9-20020a05621429c900b005ef33af0762mr8635057qvb.37.1682709019535; 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=US3crHJHzXyAIQn3rLe1hDL1V/4oOheQ9Suy5PzIt1LAQ0kaMLxbMCsjxMPwR7XFJK YXfjQJVq6cER6o1+2hTzb6mr1TMpL+hvGtQw4NV//FkssSKqoHeHRsZBPEX0d5DxFodT UZGZzCDVvQYF+5GXSu947GnFUES8WX3ZFb8l/vU0oQKWoLsYU0mmqigCdvLO9eLwSqLZ iH6lwq4nAi0yDp6vmRzn573isF2RU4XCckp8XdQzYPzmYseNCbB02BNSGnUb9XfTCP3X sPNdM122Or+bO22pwIJ6vDgZqS/LKbaE0gwKk6RSicDUMWValJjLdeZwZpyVJsdU5SgA iPXg== 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=G28nIWRmkfrOg4LOvYXCg5ECIRb9gECXuNF/km2OZAk=; b=olCgDdpCw1yKUL825KXa+c5FP7DHu8+43IHesJ0TfLkE6dJj916wuj9aBlRTysAVkn EQRlURL7ZMKogEa447akrgs39EdTM+GrgROWyeyjYegQ8DNJ5oKF1Ob6DAsFzpiXg9kf iQFGOgcokpGIvNKNuC8NVvxyXXLE0hkJaS/iDdrSRQ8bBYvmkVdzcDHfVv98cV8gtf+P O/ivSzsKAvIIhAyxRjFYAN6cNodopfzbt6NVehQJEKkMQyImdNIb8WPz9NfjgJ4n5za8 BJtBAQpLnm91QVDZG9YWx3DOtibb4atbNRe6jyD/YrPoxt5JDP4HhN1n/ew6p0HRmXK4 LvVg== 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 e15-20020a056214110f00b005dd8b749184si1372359qvs.7.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 33SJA7FB011347 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 21:10:13 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 04/10] CI: Move qemuamd64-bullseye hacks to CI layer Date: Fri, 28 Apr 2023 22:09:58 +0300 Message-Id: <20230428191004.243993-5-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: Rluv8uDWuBJ3 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 bca17049..59d83ccf 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -14,6 +14,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.34.1