From patchwork Thu Apr 17 07:27:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sai.Sathujoda@toshiba-tsip.com X-Patchwork-Id: 14055044 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 E645BC369C7 for ; Thu, 17 Apr 2025 07:31:25 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.152]) by mx.groups.io with SMTP id smtpd.web10.3259.1744875080082700082 for ; Thu, 17 Apr 2025 00:31:20 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.152, mailfrom: sai.sathujoda@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1802) id 53H7VG2N3761693; Thu, 17 Apr 2025 16:31:17 +0900 X-Iguazu-Qid: 2yAbRDIdvJ8cmaspCz X-Iguazu-QSIG: v=2; s=0; t=1744875076; q=2yAbRDIdvJ8cmaspCz; m=TWkCZeWJvnqIGnfurkx4cmNpTwtAc3LfjIlQA7H1vQM= Received: from imx2-a.toshiba.co.jp (imx2-a.toshiba.co.jp [106.186.93.35]) by relay.securemx.jp (mx-mr1800) id 53H7VFmH261958 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 17 Apr 2025 16:31:15 +0900 From: Sai.Sathujoda@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: sai ashrith sathujoda , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core v4 1/2] .gitlab-ci.yml: Set timeout value to run IEC layer tests for different targets. Date: Thu, 17 Apr 2025 12:57:07 +0530 X-TSB-HOP2: ON Message-Id: <20250417072708.2757909-1-Sai.Sathujoda@toshiba-tsip.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-OriginalArrivalTime: 17 Apr 2025 07:31:13.0373 (UTC) FILETIME=[B280A0D0:01DBAF6A] 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 ; Thu, 17 Apr 2025 07:31:25 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/18520 From: sai ashrith sathujoda Signed-off-by: sai ashrith sathujoda --- .gitlab-ci.yml | 6 +++++- scripts/submit_lava.sh | 7 +++++++ tests/templates/IEC_template.yml | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 146eb33..2c1deaa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -334,7 +334,7 @@ build:qemu-riscv64: tags: - small script: - - scripts/submit_lava.sh ${test_function} ${target} ${CI_COMMIT_SHORT_SHA} ${release} ${CI_COMMIT_REF_SLUG} + - scripts/submit_lava.sh ${test_function} ${target} ${CI_COMMIT_SHORT_SHA} ${release} ${CI_COMMIT_REF_SLUG} ${iec_test_timeout} artifacts: name: "$CI_JOB_NAME" when: always @@ -431,6 +431,7 @@ test:qemu-amd64-IEC: variables: target: qemu-amd64 test_function: IEC + iec_test_timeout: 40 test:qemu-arm64-IEC: extends: @@ -439,6 +440,7 @@ test:qemu-arm64-IEC: variables: target: qemu-arm64 test_function: IEC + iec_test_timeout: 40 test:qemu-arm-IEC: extends: @@ -447,6 +449,7 @@ test:qemu-arm-IEC: variables: target: qemu-arm test_function: IEC + iec_test_timeout: 40 test:x86-uefi-IEC: extends: @@ -455,6 +458,7 @@ test:x86-uefi-IEC: variables: target: x86-uefi test_function: IEC + iec_test_timeout: 60 test:qemu-amd64-secure-boot-unsigned-kernel: extends: diff --git a/scripts/submit_lava.sh b/scripts/submit_lava.sh index 9da083a..f69eadb 100755 --- a/scripts/submit_lava.sh +++ b/scripts/submit_lava.sh @@ -24,6 +24,10 @@ TARGET=$2 COMMIT_REF=$3 RELEASE=$4 COMMIT_BRANCH=$5 +IEC_TEST_TIMEOUT_MINUTES=$6 + +# Export to replace the timeout variable declared in IEC template +export IEC_TEST_TIMEOUT_MINUTES if [ -z "$SUBMIT_ONLY" ]; then SUBMIT_ONLY=false; fi @@ -334,6 +338,9 @@ else exit 1 fi +# Replace the IEC_TEST_TIMEOUT_MINUTES variable in template files +envsubst < ${job_dir}/*.yml > template.tmp && mv template.tmp ${job_dir}/*.yml + if ! validate_job; then clean_up exit 1 diff --git a/tests/templates/IEC_template.yml b/tests/templates/IEC_template.yml index 92944da..c8efe40 100644 --- a/tests/templates/IEC_template.yml +++ b/tests/templates/IEC_template.yml @@ -60,7 +60,7 @@ actions: # TEST_BLOCK - test: timeout: - minutes: 40 + minutes: ${IEC_TEST_TIMEOUT_MINUTES} definitions: - repository: https://gitlab.com/cip-project/cip-testing/cip-security-tests.git from: git From patchwork Thu Apr 17 07:27:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sai.Sathujoda@toshiba-tsip.com X-Patchwork-Id: 14055043 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 E86D8C369CA for ; Thu, 17 Apr 2025 07:31:25 +0000 (UTC) Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.131]) by mx.groups.io with SMTP id smtpd.web11.3327.1744875080929945429 for ; Thu, 17 Apr 2025 00:31:21 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: toshiba-tsip.com, ip: 210.130.202.131, mailfrom: sai.sathujoda@toshiba-tsip.com) Received: by mo-csw.securemx.jp (mx-mo-csw1120) id 53H7VHVX2442562; Thu, 17 Apr 2025 16:31:17 +0900 X-Iguazu-Qid: 2rWhiV7hSWpXeuZCi0 X-Iguazu-QSIG: v=2; s=0; t=1744875077; q=2rWhiV7hSWpXeuZCi0; m=ixM5FuvPNiJVYSDy7WRPZMt9o3D6crZtRW2rUy/+BP8= Received: from imx2-a.toshiba.co.jp (imx2-a.toshiba.co.jp [106.186.93.35]) by relay.securemx.jp (mx-mr1120) id 53H7VGpW083459 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 17 Apr 2025 16:31:16 +0900 From: Sai.Sathujoda@toshiba-tsip.com To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Cc: sai ashrith sathujoda , dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [isar-cip-core v4 2/2] IEC_template.yml: Update IEC layer tests revision Date: Thu, 17 Apr 2025 12:57:08 +0530 X-TSB-HOP2: ON Message-Id: <20250417072708.2757909-2-Sai.Sathujoda@toshiba-tsip.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20250417072708.2757909-1-Sai.Sathujoda@toshiba-tsip.com> References: <20250417072708.2757909-1-Sai.Sathujoda@toshiba-tsip.com> MIME-Version: 1.0 X-OriginalArrivalTime: 17 Apr 2025 07:31:13.0514 (UTC) FILETIME=[B29624A0:01DBAF6A] 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 ; Thu, 17 Apr 2025 07:31:25 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/18521 From: sai ashrith sathujoda Major changes in this update: 1. Fixed instability of TC_CR2.7_1 (Concurrent session termination) 2. Added TC_CR1.10_1 (Authenticator feedback) Signed-off-by: sai ashrith sathujoda --- tests/templates/IEC_template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/templates/IEC_template.yml b/tests/templates/IEC_template.yml index c8efe40..b93ed4b 100644 --- a/tests/templates/IEC_template.yml +++ b/tests/templates/IEC_template.yml @@ -64,7 +64,7 @@ actions: definitions: - repository: https://gitlab.com/cip-project/cip-testing/cip-security-tests.git from: git - revision: 5dbc47f55d4a43449dcbde4363e5d23d6e96344f + revision: bb19990c2b29ea96eea309e54124c74ea3246f18 path: iec-security-tests/Singlenode-TestDefinition.yaml name: Security-Testcases