From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7192322883099557888 X-Received: by 2002:a05:6870:479e:b0:15f:7e1:a517 with SMTP id c30-20020a056870479e00b0015f07e1a517mr491352oaq.13.1675399473298; Thu, 02 Feb 2023 20:44:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:219d:b0:15f:fd78:6392 with SMTP id l29-20020a056870219d00b0015ffd786392ls1997722oae.6.-pod-prod-gmail; Thu, 02 Feb 2023 20:44:32 -0800 (PST) X-Google-Smtp-Source: AK7set/lGFhECPNq6wmzzoQCzjonSicerycRvMMyD4IOXXM/DcGaAxoHc+mu8Uuw4a9FZLlI5yyy X-Received: by 2002:a05:6870:5492:b0:15b:a18a:f76a with SMTP id f18-20020a056870549200b0015ba18af76amr4298182oan.29.1675399472708; Thu, 02 Feb 2023 20:44:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675399472; cv=none; d=google.com; s=arc-20160816; b=IXHJk/bvgzNRQwtb6bZXTYIthm4f/LzRQ4s0IJFHabC0YSKj4q5MJvWYIBWCogvsb+ h4ZEa7nkWvU9w0dFEV9hrPasj28tPYRqgKeco4xQXMiR8BVka9QTHmYiFd+FdZi/A32i n7R32dYaaRTxTVMCYd3P9RXZYQ39nedlMxzSFOCsGHPTswfs+aUPoVqLL43+9Plk9Swk +bAADfwsHH/78rRc36VbaA35sgRdUk0IRXHPOBq3Jeu9oSrCwWV34AYN3HNYIbbSzYM2 RyZLiCWMtM+uG7oFSWbt4eeuZmWv4MS6AhKfgeGIvpt6SJcuG6fGF2aVk7DOowDLJuwY UKWQ== 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=R1l9/s0p3zuQTv0d9wb7M7dIm/7gyHAAFj7Pg0Alv28=; b=yc4OFMD/3NKL8sqZs7U8jogZFhs1IHkf/+jKSOMbbciADtO2FZ4kLRBPEp0vmzA5sb nfGTokWD6R6spdETpAusc+uSn2eBgsFfPe/ELZ1+TwquhSMKN9+OnxSfsKSsnv5iOmf5 tbWjnM8xGi2cn4nnZcfYxzSkxIufLOm8G2xDDljSL8NqUF09CQvy4Nq4hTf7wh5nh0Mx 2ARIF1QtRjcvE7y+rhHT7de+kiTglDWeLEFinfWnhBfnm19aYU5f59G5phx0sP5PsEea qHeMpkd+SIhivGUbWGmgLN2Sxcg2BKDwKlXmojaYRbepLOp0q621JViWu2H0JM5COQiC oSzw== 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 f8-20020a056870548800b00144a469b41dsi145965oan.4.2023.02.02.20.44.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Feb 2023 20:44:32 -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 3134iRm6023918 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 3 Feb 2023 05:44:31 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 12/15] CI: Allow example module checking disabling Date: Fri, 3 Feb 2023 05:44:23 +0100 Message-Id: <20230203044427.32711-13-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230203044427.32711-1-ubely@ilbers.de> References: <20230203044427.32711-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: w2G4E1w9A/zN From: Anton Mikanovich If the target do not have example-module package compiled it can fail on startvm test currently. Provide internal testsuite API for skipping this test. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 6 ++++-- testsuite/citest.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 18ca4919..c6a1eb67 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -209,7 +209,8 @@ class CIBuilder(Test): return env['LAYERDIR_' + layer].strip('"') - def vm_start(self, arch='amd64', distro='buster', enforce_pcbios=False): + def vm_start(self, arch='amd64', distro='buster', enforce_pcbios=False, + skip_modulecheck=False): time_to_wait = self.params.get('time_to_wait', default=60) self.log.info('===================================================') @@ -291,7 +292,8 @@ class CIBuilder(Test): if os.path.exists(output_file) and os.path.getsize(output_file) > 0: with open(output_file, "rb") as f1: data = f1.read() - if module_output in data and login_prompt in data: + if (module_output in data or skip_modulecheck) \ + and login_prompt in data: if resize_output: if resize_output in data: return diff --git a/testsuite/citest.py b/testsuite/citest.py index f5cead59..cdbede05 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -69,7 +69,7 @@ class DevTest(CIBaseTest): def test_dev_run_arm_bullseye(self): self.init() - self.vm_start('arm', 'bullseye') + self.vm_start('arm', 'bullseye', skip_modulecheck=True) class ReproTest(CIBaseTest): -- 2.20.1