From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7186681027253764096 X-Received: by 2002:a05:6870:65a9:b0:144:8ba8:b57d with SMTP id fp41-20020a05687065a900b001448ba8b57dmr4804718oab.266.1673279569661; Mon, 09 Jan 2023 07:52:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6808:180b:b0:363:b56:297 with SMTP id bh11-20020a056808180b00b003630b560297ls2360740oib.1.-pod-prod-gmail; Mon, 09 Jan 2023 07:52:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXutavpX+0IzFw54T5QJ2DaIu/F8K5yV/1DSah3bZ0S3kNy81b30UzeIP6ACONYrGYCOdV3M X-Received: by 2002:aca:6503:0:b0:35e:b1b3:fd0d with SMTP id m3-20020aca6503000000b0035eb1b3fd0dmr31453990oim.24.1673279569135; Mon, 09 Jan 2023 07:52:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673279569; cv=none; d=google.com; s=arc-20160816; b=iRh2jrmzlko3owM1QAmgt0UwXRJhsuobo5LUIbEIzQtLkJeuI4KK1nwqgcZnEuExR0 QwuIBVDauIQ9msO1GmKt0Mqsfvcjb6y0woxCW4WZRUPK1Qj1IZzpziNzztoN1v8X8Q7d K/RHbPTJgF8usZPLf4tJ86ieqOSUSoVbzu6vD38UA08KkYz8INNF8a/HdbYig7vTMECo Go0GD+DptZ2/vaaGKfiqx3nUxiS4VkxGUDs5rgLE6XZRxpqt2BPJAfSBHNzxe3e4COZJ JmJiB7cKg7EnupKY2Y0SX9o7Yq0ifM2ZIFib/4/C2TWXOKb+OWL5nn5vMufqLf5aEbPu S/iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=T2eiX96tYoFSM36hkhb73XpwfL4ghGmrjld95vYybIU=; b=mq/MNZSA8r7vkkknisFjdgvDRNIbfnjVbU0nGxZXWrvosiCxnexiXyZbSpJUAu3ZwW hsCnMskxf/0Jwgml8LyKcAcP1vpZepQvtcxbs4O4nTLyIw85TfyPS0IOw7zOANWzP21R c4seoWhlrtAIqMyNK1t4Qxw6eD4+cjnpniQZoyWPhpF6vsu88Nvk1pbAXYunVzr6bBkI V13UBNPWUgJFfT/TzBnioDnGG212APXakTLdtE0saGXmr3WIuJaWWD89eJYQz7wgCuN5 iZdvgh7+H0zsj4i/YDQYeNpIiCXoWQr4g8w+D3s5Xp1vN0hG9OMJfEXXZhi6x54/M+BY dX8A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of venkata.pyla@toshiba-tsip.com designates 210.130.202.158 as permitted sender) smtp.mailfrom=venkata.pyla@toshiba-tsip.com Return-Path: Received: from mo-csw.securemx.jp (mo-csw1116.securemx.jp. [210.130.202.158]) by gmr-mx.google.com with ESMTPS id u13-20020a056871008d00b001480308ea6csi1058725oaa.0.2023.01.09.07.52.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Jan 2023 07:52:48 -0800 (PST) Received-SPF: pass (google.com: domain of venkata.pyla@toshiba-tsip.com designates 210.130.202.158 as permitted sender) client-ip=210.130.202.158; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of venkata.pyla@toshiba-tsip.com designates 210.130.202.158 as permitted sender) smtp.mailfrom=venkata.pyla@toshiba-tsip.com Received: by mo-csw.securemx.jp (mx-mo-csw1116) id 309FqjSm011671; Tue, 10 Jan 2023 00:52:45 +0900 X-Iguazu-Qid: 2wGrN434gKdewkb008 X-Iguazu-QSIG: v=2; s=0; t=1673279565; q=2wGrN434gKdewkb008; m=joZlKcTDMYDoiGMUDQnLqRv89qWijYCevcchhskJvtk= Received: from imx12-a.toshiba.co.jp ([38.106.60.135]) by relay.securemx.jp (mx-mr1110) id 309FqiUf009833 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 10 Jan 2023 00:52:45 +0900 From: venkata.pyla@toshiba-tsip.com To: isar-users@googlegroups.com Cc: venkata pyla , amikan@ilbers.de, jan.kiszka@siemens.com, henning.schild@siemens.com, kazuhiro3.hayashi@toshiba.co.jp, dinesh.kumar@toshiba-tsip.com Subject: [PATCH] repro-build-test.py: Use bitbake env to get image filename Date: Mon, 9 Jan 2023 21:22:57 +0530 X-TSB-HOP2: ON Message-Id: <20230109155257.26183-1-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-OriginalArrivalTime: 09 Jan 2023 15:52:43.0485 (UTC) FILETIME=[692898D0:01D92442] X-TUID: Q1Wsf6cOyVnC From: venkata pyla The hard-coded distro name 'debian' will break the test when other distros are used. So the image_name is prepared using bitbake environment variables. Signed-off-by: venkata pyla --- testsuite/repro-build-test.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/testsuite/repro-build-test.py b/testsuite/repro-build-test.py index 5d92e2c..1c0b05b 100755 --- a/testsuite/repro-build-test.py +++ b/testsuite/repro-build-test.py @@ -29,11 +29,14 @@ class ReproBuild(CIBuilder): def get_image_path(self, target_name): image_dir = "tmp/deploy/images" - target_params = target_name.split(":") - machine = target_params[1].split("-")[0] - distro = "debian-" + target_params[1].split("-")[1] - image_type = target_params[2] - return f"{image_dir}/{machine}/{image_type}-{distro}-{machine}.tar.gz" + output = process.getoutput( + f'bitbake -e {target_name} ' + r'| grep "^MACHINE=\|^IMAGE_FULLNAME="' + ) + env = dict(d.split("=", 1) for d in output.splitlines()) + machine = env["MACHINE"].strip("\"") + image_name = env["IMAGE_FULLNAME"].strip("\"") + return f"{image_dir}/{machine}/{image_name}.tar.gz" def build_repro_image( self, target, source_date_epoch=None, image_name="image.tar.gz" -- 2.20.1