From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7197811629045579776 X-Received: by 2002:a05:6870:b28e:b0:169:bef9:e137 with SMTP id c14-20020a056870b28e00b00169bef9e137mr414494oao.3.1675871117216; Wed, 08 Feb 2023 07:45:17 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6830:6484:b0:68d:b7eb:4712 with SMTP id ck4-20020a056830648400b0068db7eb4712ls125441otb.8.-pod-prod-gmail; Wed, 08 Feb 2023 07:45:16 -0800 (PST) X-Google-Smtp-Source: AK7set9A0jjz1xUfqJyQ5n90SHsSBAzbV28zZZL+RNY7ieZ5zm27E6EuEsX/ZiKnZgydkse42COE X-Received: by 2002:a05:6830:31b3:b0:68b:b972:481d with SMTP id q19-20020a05683031b300b0068bb972481dmr4876290ots.8.1675871116622; Wed, 08 Feb 2023 07:45:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675871116; cv=none; d=google.com; s=arc-20160816; b=CjSt/GeStl2xHSDJTTxtK0qUkS4pxO2gtncNFUaOq4nF6y/c3qJyTYP5ego/fzvbss SRDR2C/hOprar7XkVCoI+KXP687BlwP4xy6AnM0oZinugLtS1y+SzsLb2a8iN+Gp2X91 oKShvkAkBshseWIRRnPpGTvYriTtEXa5N/b4y66VVFvSexFmAONmoLF25aJefSffysBm h9fUU2iqAgGHNQVp1SgHG1qQDp4z3ItsgBoto8nYfPgkC4YS4gh8eJQIdc49amOgxwSn sacm1CHDFPVXFx1oAy9GcqAlyZow1HjXq6k0pZuXy+cIBtAQcC5hE48qAzTOjZlbD8Ho ez5g== 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=6UISJkV/QSyO5uJfE+zg6gNQqSfvS1NFzA4GdDQrXZc=; b=b7kcgffNWPnLUXwASdmBqg509cbhBweKTh151Y3Fn5Xw/tR23BW5Zs++2tnTxU2PDm dLfnOdFWdxfLG/acTv6dWnmZVC8/Gzws8UiuvZYOtWOy47DYH5gA8MhQnvAyEID+b7Rj Ivb+WSuwj2SjyaESACB2+KPr1bjk9TMAVBHGLHpgyYmhQtYTfDifrkn5sHsqUADtqc+K 9aEm3oGGq1E4ja1izw40HTrL5WrHWpf5MA2kKFCa0LWjJso0sPdvgB8F3QI7jvQUM9iT GoKvWMlulmaSVxpPBSCW4SJxm2xc4kd5SuxGscAu3ic32ay0+87JD055iSM0s2fpFqB1 wkuA== 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 u14-20020a9d4d8e000000b00686566f6f48si1687971otk.0.2023.02.08.07.45.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Feb 2023 07:45:16 -0800 (PST) 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 318FjB51015298 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Feb 2023 16:45:14 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 8/9] testsuite: Run custom commands and scripts on some qemu targets Date: Wed, 8 Feb 2023 16:45:10 +0100 Message-Id: <20230208154511.1884-9-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230208154511.1884-1-ubely@ilbers.de> References: <20230208154511.1884-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: b/hGPYgKTI2R For demonstaration purposes, build 'isar-image-ci' for some targets and add corresponding VM run tests with custom commands and scripts. Signed-off-by: Uladzimir Bely --- testsuite/citest.py | 105 ++++++++++++++++++++++++++----- testsuite/test_example_module.sh | 5 ++ testsuite/test_getty_target.sh | 7 +++ 3 files changed, 103 insertions(+), 14 deletions(-) create mode 100644 testsuite/test_example_module.sh create mode 100644 testsuite/test_getty_target.sh diff --git a/testsuite/citest.py b/testsuite/citest.py index 975cb064..17a90244 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -123,8 +123,8 @@ class CrossTest(CIBaseTest): """ def test_cross(self): targets = [ - 'mc:qemuarm-buster:isar-image-base', - 'mc:qemuarm-bullseye:isar-image-base', + 'mc:qemuarm-buster:isar-image-ci', + 'mc:qemuarm-bullseye:isar-image-ci', 'mc:de0-nano-soc-bullseye:isar-image-base', 'mc:stm32mp15x-buster:isar-image-base' ] @@ -156,7 +156,7 @@ class CrossTest(CIBaseTest): def test_cross_bookworm(self): targets = [ - 'mc:qemuarm-bookworm:isar-image-base', + 'mc:qemuarm-bookworm:isar-image-ci', 'mc:qemuarm64-bookworm:isar-image-base' ] @@ -198,9 +198,9 @@ class NoCrossTest(CIBaseTest): """ def test_nocross(self): targets = [ - 'mc:qemuarm-buster:isar-image-base', + 'mc:qemuarm-buster:isar-image-ci', 'mc:qemuarm-bullseye:isar-image-base', - 'mc:qemuarm64-bullseye:isar-image-base', + 'mc:qemuarm64-bullseye:isar-image-ci', 'mc:qemui386-buster:isar-image-base', 'mc:qemui386-bullseye:isar-image-base', 'mc:qemuamd64-buster:isar-image-base', @@ -214,7 +214,7 @@ class NoCrossTest(CIBaseTest): 'mc:bananapi-bullseye:isar-image-base', 'mc:nanopi-neo-bullseye:isar-image-base', 'mc:stm32mp15x-bullseye:isar-image-base', - 'mc:qemuamd64-focal:isar-image-base' + 'mc:qemuamd64-focal:isar-image-ci' ] self.init() @@ -241,7 +241,7 @@ class NoCrossTest(CIBaseTest): 'mc:qemuamd64-bookworm:isar-image-base', 'mc:qemuarm-bookworm:isar-image-base', 'mc:qemui386-bookworm:isar-image-base', - 'mc:qemumipsel-bookworm:isar-image-base', + 'mc:qemumipsel-bookworm:isar-image-ci', 'mc:hikey-bookworm:isar-image-base' ] @@ -340,15 +340,48 @@ class VmBootTestFast(CIBaseTest): """ def test_arm_bullseye(self): self.init() - self.vm_start('arm','bullseye') + self.vm_start('arm','bullseye', \ + image='isar-image-ci') + + def test_arm_bullseye_example_module(self): + self.init() + self.vm_start('arm','bullseye', \ + image='isar-image-ci', cmd='lsmod | grep example_module') + + def test_arm_bullseye_getty_target(self): + self.init() + self.vm_start('arm','bullseye', \ + image='isar-image-ci', script='test_getty_target.sh') def test_arm_buster(self): self.init() - self.vm_start('arm','buster') + self.vm_start('arm','buster', \ + image='isar-image-ci') + + def test_arm_buster_getty_target(self): + self.init() + self.vm_start('arm','buster', \ + image='isar-image-ci', cmd='systemctl is-active getty.target') + + def test_arm_buster_example_module(self): + self.init() + self.vm_start('arm','buster', \ + image='isar-image-ci', script='test_example_module.sh') def test_arm_bookworm(self): self.init() - self.vm_start('arm','bookworm') + self.vm_start('arm','bookworm', \ + image='isar-image-ci') + + def test_arm_bookworm_example_module(self): + self.init() + self.vm_start('arm','bookworm', \ + image='isar-image-ci', cmd='lsmod | grep example_module') + + def test_arm_bookworm_getty_target(self): + self.init() + self.vm_start('arm','bookworm', \ + image='isar-image-ci', script='test_getty_target.sh') class VmBootTestFull(CIBaseTest): @@ -363,11 +396,33 @@ class VmBootTestFull(CIBaseTest): def test_arm_buster(self): self.init() - self.vm_start('arm','buster') + self.vm_start('arm','buster', \ + image='isar-image-ci') + + def test_arm_buster_example_module(self): + self.init() + self.vm_start('arm','buster', \ + image='isar-image-ci', cmd='lsmod | grep example_module') + + def test_arm_buster_getty_target(self): + self.init() + self.vm_start('arm','buster', \ + image='isar-image-ci', script='test_getty_target.sh') def test_arm64_bullseye(self): self.init() - self.vm_start('arm64','bullseye') + self.vm_start('arm64','bullseye', \ + image='isar-image-ci') + + def test_arm64_bullseye_getty_target(self): + self.init() + self.vm_start('arm64','bullseye', \ + image='isar-image-ci', cmd='systemctl is-active getty.target') + + def test_arm64_bullseye_example_module(self): + self.init() + self.vm_start('arm64','bullseye', \ + image='isar-image-ci', script='test_example_module.sh') def test_i386_buster(self): self.init() @@ -382,7 +437,18 @@ class VmBootTestFull(CIBaseTest): def test_amd64_focal(self): self.init() - self.vm_start('amd64','focal') + self.vm_start('amd64','focal', \ + image='isar-image-ci') + + def test_amd64_focal_example_module(self): + self.init() + self.vm_start('amd64','focal', \ + image='isar-image-ci', cmd='lsmod | grep example_module') + + def test_amd64_focal_getty_target(self): + self.init() + self.vm_start('amd64','focal', \ + image='isar-image-ci', script='test_getty_target.sh') def test_amd64_bookworm(self): self.init() @@ -398,4 +464,15 @@ class VmBootTestFull(CIBaseTest): def test_mipsel_bookworm(self): self.init() - self.vm_start('mipsel','bookworm') + self.vm_start('mipsel','bookworm', \ + image='isar-image-ci') + + def test_mipsel_bookworm_getty_target(self): + self.init() + self.vm_start('mipsel','bookworm', \ + image='isar-image-ci', cmd='systemctl is-active getty.target') + + def test_mipsel_bookworm_example_module(self): + self.init() + self.vm_start('mipsel','bookworm', \ + image='isar-image-ci', script='test_example_module.sh') diff --git a/testsuite/test_example_module.sh b/testsuite/test_example_module.sh new file mode 100644 index 00000000..175030d1 --- /dev/null +++ b/testsuite/test_example_module.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +lsmod | grep '^example_module ' diff --git a/testsuite/test_getty_target.sh b/testsuite/test_getty_target.sh new file mode 100644 index 00000000..38c0fc1e --- /dev/null +++ b/testsuite/test_getty_target.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +sleep 10 + +systemctl is-active getty.target -- 2.20.1