From patchwork Fri Jun 23 14:05:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Pyla X-Patchwork-Id: 13290653 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D252DC001B3 for ; Fri, 23 Jun 2023 14:06:15 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.153]) by mx.groups.io with SMTP id smtpd.web10.42886.1687529165449111755 for ; Fri, 23 Jun 2023 07:06:06 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.153, mailfrom: venkata.pyla@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1514) id 35NE63ur025695; Fri, 23 Jun 2023 23:06:03 +0900 X-Iguazu-Qid: 34trY2IxWgf5xJJi9j X-Iguazu-QSIG: v=2; s=0; t=1687529162; q=34trY2IxWgf5xJJi9j; m=79zY4YvIolEDpuQ0+4hoYUkIWPNeiGvPyyHzRQsr6Y0= Received: from imx2-a.toshiba.co.jp (imx2-a.toshiba.co.jp [106.186.93.35]) by relay.securemx.jp (mx-mr1513) id 35NE61mQ021172 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 23 Jun 2023 23:06:02 +0900 From: venkata.pyla@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: venkata pyla , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core 1/3] .reproducible-check-ci.yml: Add swupdate targets in reproducible check Date: Fri, 23 Jun 2023 19:35:53 +0530 X-TSB-HOP2: ON Message-Id: <20230623140555.11428-2-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230623140555.11428-1-venkata.pyla@toshiba-tsip.com> References: <20230623140555.11428-1-venkata.pyla@toshiba-tsip.com> MIME-Version: 1.0 X-OriginalArrivalTime: 23 Jun 2023 14:05:59.0395 (UTC) FILETIME=[D62EC330:01D9A5DB] List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 23 Jun 2023 14:06:15 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12144 From: venkata pyla Signed-off-by: venkata pyla --- .reproducible-check-ci.yml | 49 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/.reproducible-check-ci.yml b/.reproducible-check-ci.yml index d8bfb40..5ea7857 100644 --- a/.reproducible-check-ci.yml +++ b/.reproducible-check-ci.yml @@ -82,6 +82,30 @@ build:qemu-arm-base-repro-build: variables: target: qemu-arm +build:qemu-amd64-swupdate-repro-build: + extends: + - .repro-build + variables: + target: qemu-amd64 + extension: ebg-swu + wic_targz: enable + +build:qemu-arm64-swupdate-repro-build: + extends: + - .repro-build + variables: + target: qemu-arm64 + extension: ebg-swu + wic_targz: enable + +build:qemu-arm-swupdate-repro-build: + extends: + - .repro-build + variables: + target: qemu-arm + extension: ebg-swu + wic_targz: enable + # repro build test test:qemu-amd64-base-repro-test: extends: @@ -106,3 +130,28 @@ test:qemu-arm-base-repro-test: target: qemu-arm dependencies: - build:qemu-arm-base-repro-build + +test:qemu-amd64-swupdate-repro-test: + extends: + - .repro-test + variables: + target: qemu-amd64 + dependencies: + - build:qemu-amd64-swupdate-repro-build + +test:qemu-arm64-swupdate-repro-test: + extends: + - .repro-test + variables: + target: qemu-arm64 + dependencies: + - build:qemu-arm64-swupdate-repro-build + +test:qemu-arm-swupdate-repro-test: + extends: + - .repro-test + variables: + target: qemu-arm + dependencies: + - build:qemu-arm-swupdate-repro-build + From patchwork Fri Jun 23 14:05:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Pyla X-Patchwork-Id: 13290655 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF6B5EB64D7 for ; Fri, 23 Jun 2023 14:06:15 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.153]) by mx.groups.io with SMTP id smtpd.web11.42921.1687529167251418082 for ; Fri, 23 Jun 2023 07:06:07 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.153, mailfrom: venkata.pyla@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1514) id 35NE64Wi025736; Fri, 23 Jun 2023 23:06:05 +0900 X-Iguazu-Qid: 34trEg1Q9Jc7UnDFbc X-Iguazu-QSIG: v=2; s=0; t=1687529164; q=34trEg1Q9Jc7UnDFbc; m=VxFR0P+vZjqYl90WqwV5XLBzZkyScooFDOQjd8rBCLU= Received: from imx12-a.toshiba.co.jp ([38.106.60.135]) by relay.securemx.jp (mx-mr1511) id 35NE632g032528 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 23 Jun 2023 23:06:04 +0900 From: venkata.pyla@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: venkata pyla , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core 2/3] .reproducible-check-ci.yml: Include only files required for RB check Date: Fri, 23 Jun 2023 19:35:54 +0530 X-TSB-HOP2: ON Message-Id: <20230623140555.11428-3-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230623140555.11428-1-venkata.pyla@toshiba-tsip.com> References: <20230623140555.11428-1-venkata.pyla@toshiba-tsip.com> MIME-Version: 1.0 X-OriginalArrivalTime: 23 Jun 2023 14:05:59.0535 (UTC) FILETIME=[D6441FF0:01D9A5DB] List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 23 Jun 2023 14:06:15 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12146 From: venkata pyla artifacts folder contains many other files like dpkg_status, manifest, etc, which are not verified in reproducible check, so include only the files are used in reproducible check. Signed-off-by: venkata pyla --- .reproducible-check-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.reproducible-check-ci.yml b/.reproducible-check-ci.yml index 5ea7857..ede358b 100644 --- a/.reproducible-check-ci.yml +++ b/.reproducible-check-ci.yml @@ -39,8 +39,12 @@ expire_in: 1 day paths: - scripts/repro-tests.sh - - image1 - - image2 + - image*/*initrd.img + - image*/*-vmlinu* + - image*/*.tar.gz + - image*/*.squashfs + - image*/*.swu + - image*/linux.efi .repro-test: image: From patchwork Fri Jun 23 14:05:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Pyla X-Patchwork-Id: 13290652 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0336EB64DD for ; Fri, 23 Jun 2023 14:06:15 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.133]) by mx.groups.io with SMTP id smtpd.web10.42888.1687529169018135882 for ; Fri, 23 Jun 2023 07:06:09 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.133, mailfrom: venkata.pyla@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1116) id 35NE65WJ015854; Fri, 23 Jun 2023 23:06:05 +0900 X-Iguazu-Qid: 2wHHJG9eOsx0250qAq X-Iguazu-QSIG: v=2; s=0; t=1687529165; q=2wHHJG9eOsx0250qAq; m=9t6YBPu3fTT+F9zx4HDoRTLUI+HPMfsV/JKw1JOKDK0= Received: from imx12-a.toshiba.co.jp ([38.106.60.135]) by relay.securemx.jp (mx-mr1111) id 35NE6338018181 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 23 Jun 2023 23:06:04 +0900 From: venkata.pyla@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: venkata pyla , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core 3/3] repro-tests.sh: Enable html output in diffoscope Date: Fri, 23 Jun 2023 19:35:55 +0530 X-TSB-HOP2: ON Message-Id: <20230623140555.11428-4-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230623140555.11428-1-venkata.pyla@toshiba-tsip.com> References: <20230623140555.11428-1-venkata.pyla@toshiba-tsip.com> MIME-Version: 1.0 X-OriginalArrivalTime: 23 Jun 2023 14:05:59.0606 (UTC) FILETIME=[D64EF560:01D9A5DB] List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 23 Jun 2023 14:06:15 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12147 From: venkata pyla diffoscope generates output in html format that will be helpful to easily view the non-reproducible differences in the browser. Signed-off-by: venkata pyla --- .reproducible-check-ci.yml | 3 ++- scripts/repro-tests.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.reproducible-check-ci.yml b/.reproducible-check-ci.yml index ede358b..1c53c77 100644 --- a/.reproducible-check-ci.yml +++ b/.reproducible-check-ci.yml @@ -64,7 +64,8 @@ when: always expire_in: 1 day paths: - - "./*diffoscope_output.txt" + - "diffoscope_output" + - "./*diffoscope_output.*" # repro build diff --git a/scripts/repro-tests.sh b/scripts/repro-tests.sh index b37c15e..94de950 100755 --- a/scripts/repro-tests.sh +++ b/scripts/repro-tests.sh @@ -78,6 +78,8 @@ res=0 for file in "$@"; do if [ -f "${artifacts1}/${file}" ] && [ -f "${artifacts1}/${file}" ]; then if $DIFFOSCOPE --text "${file}.diffoscope_output.txt" \ + --html-dir diffoscope_output \ + --html "${file}.diffoscope_output.html" \ "${artifacts1}/${file}" \ "${artifacts2}/${file}" > /dev/null 2>&1; then echo "${file}: ${GREEN}Reproducible${NC}" | tee -a diffoscope_output.txt