From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7008446828784910336 X-Received: by 2002:a05:6512:3b94:: with SMTP id g20mr211349lfv.77.1633020362889; Thu, 30 Sep 2021 09:46:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1795:: with SMTP id bn21ls1409620ljb.10.gmail; Thu, 30 Sep 2021 09:46:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxs/2oduxBSLaTADaDjA/k8NboFjg8lqD5aKzaDTog7/rlld3firjM2EFEnUfQ/8o1L1wox X-Received: by 2002:a2e:3903:: with SMTP id g3mr6395305lja.241.1633020361865; Thu, 30 Sep 2021 09:46:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633020361; cv=none; d=google.com; s=arc-20160816; b=UN/0BDKBeCAoy1l7YA+zZh4SsRLHzdb+AVcups8iOCTnCvV1/QJ8NYJBg3D6/R0tpg 1u4z+aYynNUP96UJLSAJ0Y18Vyk9iWuvgbM2nQ4Zabh7JfLQGkQm8vOvfYzMGzmWbuxw y0mp8+yAm0E+9eNZvl/E26u+7Uo0SlxeuCh20eqUm40J3i71VKWh6AfmwUcxYAvK4ERF zxeAYMZYlnj7u6NnsEWrPpFXdGWPDdNjz1bt5TzQCV6HXnVIC+GUnkVyePYajZKk7zUm i+k2kSLT2UuOaV6gKFyYdMbPtV61UKZZ+PYPU1LJYoNk2vGXrJQUsoyHCIXwcEPAmdSn Q0Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=uZWzEJqKgJ9zf7g8gD0oRzplPokj9aoMcrVX1Z7PV1s=; b=XtwpJKL7UHvEVEEDtA5Un4GF/uIoEcXrkJ6Sh3Tkx6ZqGgCZNn3HOI9LW9pERnvwAX eKmGtPr2IC/voQzFilR4K/dxyKmq49KvKqr9oLJM/C8dRpA5mEE3Rc7kuifkvmC7ptcS Ctpa/gZ4WGJtt9256nnf7eiwfKOcufqvi+U2wsOE+8OmN9AwIthZElzxva/Udc/NSheL upysKNsVCf1habM80OJcIhMoL/nty/uxur2VsWw9286WaLBGgMvYNbP7wd6m0Lk66ySL 7V5SdOrxcXbtWFT6+pCB/sMqDaCIKuoPmhSSbNoj8FqHAOOUIcPviJE6MdRABHenqVQh n1yQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) smtp.mailfrom=anton.mikanovich@promwad.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=promwad.com Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o26si193113lfc.4.2021.09.30.09.46.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Sep 2021 09:46:01 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) smtp.mailfrom=anton.mikanovich@promwad.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=promwad.com Received: from ws-323.promwad.corp (leased-line-st-87-252-252-30.telecom.by [87.252.252.30]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 18UGjhue018892 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=NOT); Thu, 30 Sep 2021 18:45:59 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v14 06/16] vm_boot_test: Remove external varianter Date: Thu, 30 Sep 2021 19:45:31 +0300 Message-Id: <1633020341-26062-7-git-send-email-anton.mikanovich@promwad.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1633020341-26062-1-git-send-email-anton.mikanovich@promwad.com> References: <1633020341-26062-1-git-send-email-anton.mikanovich@promwad.com> X-TUID: fJpXytcIW/tG From: Anton Mikanovich To get rid of avocado-framework-plugin-varianter-yaml-to-mux pip dependency we should not use yaml-to-mux parameters. Signed-off-by: Anton Mikanovich --- testsuite/vm_boot_test/run.sh | 3 --- testsuite/vm_boot_test/run_fast.sh | 3 +++ testsuite/vm_boot_test/run_full.sh | 3 +++ testsuite/vm_boot_test/variant.yaml | 22 ----------------- testsuite/vm_boot_test/vm_boot_test.py | 45 ++++++++++++++++++++++++++++++---- 5 files changed, 46 insertions(+), 30 deletions(-) delete mode 100755 testsuite/vm_boot_test/run.sh create mode 100755 testsuite/vm_boot_test/run_fast.sh create mode 100755 testsuite/vm_boot_test/run_full.sh delete mode 100644 testsuite/vm_boot_test/variant.yaml diff --git a/testsuite/vm_boot_test/run.sh b/testsuite/vm_boot_test/run.sh deleted file mode 100755 index 9fdda95..0000000 --- a/testsuite/vm_boot_test/run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -avocado run vm_boot_test.py --mux-yaml test:variant.yaml --mux-inject build_dir:$BUILDDIR time_to_wait:300 diff --git a/testsuite/vm_boot_test/run_fast.sh b/testsuite/vm_boot_test/run_fast.sh new file mode 100755 index 0000000..0fc77b3 --- /dev/null +++ b/testsuite/vm_boot_test/run_fast.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +avocado run vm_boot_test.py -t fast -p build_dir="$BUILDDIR" -p time_to_wait=300 diff --git a/testsuite/vm_boot_test/run_full.sh b/testsuite/vm_boot_test/run_full.sh new file mode 100755 index 0000000..a561a36 --- /dev/null +++ b/testsuite/vm_boot_test/run_full.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +avocado run vm_boot_test.py -t full -p build_dir="$BUILDDIR" -p time_to_wait=300 diff --git a/testsuite/vm_boot_test/variant.yaml b/testsuite/vm_boot_test/variant.yaml deleted file mode 100644 index 9ddc634..0000000 --- a/testsuite/vm_boot_test/variant.yaml +++ /dev/null @@ -1,22 +0,0 @@ -variants: !mux - stretch-amd64: - distro: "stretch" - arch: "amd64" - stretch-i386: - distro: "stretch" - arch: "i386" - stretch-arm: - distro: "stretch" - arch: "arm" - stretch-arm64: - distro: "stretch" - arch: "arm64" - buster-amd64: - distro: "buster" - arch: "amd64" - buster-i386: - distro: "buster" - arch: "i386" - buster-arm: - distro: "buster" - arch: "arm" diff --git a/testsuite/vm_boot_test/vm_boot_test.py b/testsuite/vm_boot_test/vm_boot_test.py index 64dfda6..eee14b2 100644 --- a/testsuite/vm_boot_test/vm_boot_test.py +++ b/testsuite/vm_boot_test/vm_boot_test.py @@ -13,13 +13,10 @@ import start_vm from avocado import Test -class VmBootTest(Test): +class VmBase(Test): - def test(self): - # TODO: add default values + def vm_start(self, arch='amd64', distro='buster'): build_dir = self.params.get('build_dir', default='.') - arch = self.params.get('arch', default='arm') - distro = self.params.get('distro', default='stretch') time_to_wait = self.params.get('time_to_wait', default=60) self.log.info('===================================================') @@ -49,3 +46,41 @@ class VmBootTest(Test): return self.fail('Test failed') + +class VmBootTestFast(VmBase): + + """ + Test QEMU image start (fast) + + :avocado: tags=fast,full + """ + def test_arm_stretch(self): + self.vm_start('arm','stretch') + + def test_arm_buster(self): + self.vm_start('arm','buster') + + def test_arm64_stretch(self): + self.vm_start('arm64','stretch') + + def test_amd64_stretch(self): + self.vm_start('amd64','stretch') + +class VmBootTestFull(VmBase): + + """ + Test QEMU image start (full) + + :avocado: tags=full + """ + def test_i386_stretch(self): + self.vm_start('i386','stretch') + + def test_i386_buster(self): + self.vm_start('i386','buster') + + def test_amd64_buster(self): + self.vm_start('amd64','buster') + + def test_amd64_focal(self): + self.vm_start('amd64','focal') -- 2.7.4