From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7327959769307676672 X-Received: by 2002:a05:600c:3510:b0:40e:cd4f:f1b5 with SMTP id h16-20020a05600c351000b0040ecd4ff1b5mr323280wmq.105.1706173592356; Thu, 25 Jan 2024 01:06:32 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1390:b0:40e:ce51:f2a with SMTP id u16-20020a05600c139000b0040ece510f2als338665wmf.1.-pod-prod-02-eu; Thu, 25 Jan 2024 01:06:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IFYWQRIldHvzbh4xqMbATgVA4Zfi/mVAW6EZrWx4zazYQqnLYSjhfWAxMKrtVGmJ42fTrYF X-Received: by 2002:a05:600c:4e86:b0:40e:c31b:653d with SMTP id f6-20020a05600c4e8600b0040ec31b653dmr219665wmq.39.1706173590448; Thu, 25 Jan 2024 01:06:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706173590; cv=none; d=google.com; s=arc-20160816; b=Ty4MH4lAsSjhbP6tbWfnJt5HmvzDa5FrEZsZ2ZwdOuerEzhyjMJs0EYE3JwdgPzKXw 6wq/UKA4mbaVZ5GnoiAdgXZaHddzrVqdZAiOPlY1tJ4bMDKfdA/jPsw0Od9ipTC8QH+q Hzew7DKry3Hujx4swER98UvxUt62A0hp4fMTklnIXet8p/J46r4k0pEfloImHxII3U0w zMuWZ1H6DTCEE3TG3n0cfZO5qF9ceXLyBwT88mBO78xnCH3Vfct0L12H9mlEXv/sWqjP yx4sID9o0SgLIi87c7DabZGV5erxGGDR8oEIGperytPw9oUrpZSIKZH3521G2gJqWhPo CIaA== 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=YJjCb4Nd6x9dZSGGqQ6UkHt7fPYcpRr0FxyZwrBGpDo=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=jTVfQflYgygAq0oZ+8Fef2MqSYgHGRMDkqLHuYM/7NFEGfULw1IW7a7PECDEGBW9Zc YdQFvq/CnoFRxHKeY+m1/Hv1dop0348O3eTRLXuiKtL2QHiWvXV3a5gTMyoU/oxGfUFm vQo7bmA34vMqA85B3y5RQDmvQJTm0VcR3evxqE+RpiQdRlEecmiY63gMF7ZUBxcQOPng nLgFXPgzybv+yB8OGIMpb8TG+/r/ngIjb7tNIjL3fbqG44zXdvvWvXW2IsWcEMXqGyhB 0mblqCxTzh4MG0gRi5UlmstdRUXtRe/9MScE1bjgUWKeCyeSzJsCGy4lc21D7+DvY0Md drmQ== 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 z8-20020a05600c0a0800b0040ec36d6d7fsi45410wmp.0.2024.01.25.01.06.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 01:06:30 -0800 (PST) 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.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 40P96PqW010870 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 Jan 2024 10:06:29 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 4/4] CI: Use getVars for vm output checking Date: Thu, 25 Jan 2024 11:06:17 +0200 Message-Id: <20240125090617.2945621-5-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125090617.2945621-1-amikan@ilbers.de> References: <20240125090617.2945621-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: LlEitCNvigfe This will reduce overhead and should speedup startvm tests execution. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 273a1dce..0f2aa0f5 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -507,17 +507,20 @@ BBPATH .= ":${LAYERDIR}"\ return 1 - def vm_parse_output(self, boot_log, bb_output, skip_modulecheck): + def vm_parse_output(self, boot_log, multiconfig, skip_modulecheck): # the printk of recipes-kernel/example-module module_output = b'Just an example' resize_output = None - image_fstypes = start_vm.get_bitbake_var(bb_output, 'IMAGE_FSTYPES') - wks_file = start_vm.get_bitbake_var(bb_output, 'WKS_FILE') + image_fstypes, \ + wks_file, \ + bbdistro = self.getVars('IMAGE_FSTYPES', \ + 'WKS_FILE', \ + 'DISTRO', \ + target=multiconfig) # only the first type will be tested in start_vm.py if image_fstypes.split()[0] == 'wic': if wks_file: - bbdistro = start_vm.get_bitbake_var(bb_output, 'DISTRO') # ubuntu is less verbose so we do not see the message # /etc/sysctl.d/10-console-messages.conf if bbdistro and "ubuntu" not in bbdistro: @@ -627,8 +630,8 @@ BBPATH .= ":${LAYERDIR}"\ self.vm_turn_off(vm) self.fail('Failed to run test over ssh') else: - bb_output = start_vm.get_bitbake_env(arch, distro, image).decode() - rc = self.vm_parse_output(boot_log, bb_output, skip_modulecheck) + multiconfig = 'mc:qemu' + arch + '-' + distro + ':' + image + rc = self.vm_parse_output(boot_log, multiconfig, skip_modulecheck) if rc != 0: if stop_vm: self.vm_turn_off(vm) -- 2.34.1