From 1e5fb15afa5b63c719dff07a471521e0a4a607d7 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 29 Jul 2024 12:46:43 +0200 Subject: [PATCH] ci/poe-powered: rename --test-timeout to --test-timeout-minutes to be more explicit Due to how python's argparse works, anyone anywhere else that would continue passing `--test-timeout` would not see any change, it will transparently work for them too. Part-of: --- .gitlab-ci/bare-metal/poe-powered.sh | 2 +- .gitlab-ci/bare-metal/poe_run.py | 4 ++-- src/broadcom/ci/gitlab-ci.yml | 12 ++++++------ src/gallium/drivers/nouveau/ci/gitlab-ci.yml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci/bare-metal/poe-powered.sh b/.gitlab-ci/bare-metal/poe-powered.sh index 4d172b1e05b..02cce07ae3f 100755 --- a/.gitlab-ci/bare-metal/poe-powered.sh +++ b/.gitlab-ci/bare-metal/poe-powered.sh @@ -199,7 +199,7 @@ while [ $((ATTEMPTS--)) -gt 0 ]; do --dev="$BM_SERIAL" \ --powerup="$BM_POWERUP" \ --powerdown="$BM_POWERDOWN" \ - --test-timeout ${TEST_PHASE_TIMEOUT:-20} + --test-timeout-minutes ${TEST_PHASE_TIMEOUT_MINUTES:-20} ret=$? if [ $ret -eq 2 ]; then diff --git a/.gitlab-ci/bare-metal/poe_run.py b/.gitlab-ci/bare-metal/poe_run.py index 98e5d4e35d2..60a37f86652 100755 --- a/.gitlab-ci/bare-metal/poe_run.py +++ b/.gitlab-ci/bare-metal/poe_run.py @@ -109,12 +109,12 @@ def main(): parser.add_argument('--powerdown', type=str, help='shell command for powering off', required=True) parser.add_argument( - '--test-timeout', type=int, help='Test phase timeout (minutes)', required=True) + '--test-timeout-minutes', type=int, help='Test phase timeout (minutes)', required=True) args = parser.parse_args() logger = CustomLogger("job_detail.json") logger.update_dut_time("start", None) - poe = PoERun(args, args.test_timeout * 60, logger) + poe = PoERun(args, args.test_timeout_minutes * 60, logger) retval = poe.run() poe.logged_system(args.powerdown) diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml index 1152d8e391d..77542d1934c 100644 --- a/src/broadcom/ci/gitlab-ci.yml +++ b/src/broadcom/ci/gitlab-ci.yml @@ -64,7 +64,7 @@ v3d-rpi4-gl-full:arm64: parallel: 6 timeout: 45m variables: - TEST_PHASE_TIMEOUT: 40 + TEST_PHASE_TIMEOUT_MINUTES: 40 DEQP_FRACTION: 1 v3d-rpi4-rusticl:arm64: @@ -75,7 +75,7 @@ v3d-rpi4-rusticl:arm64: timeout: 30m # base run time = 17min test, 19min total variables: DEQP_SUITE: v3d-rusticl - TEST_PHASE_TIMEOUT: 25 + TEST_PHASE_TIMEOUT_MINUTES: 25 v3d-rpi4-traces:arm64: extends: @@ -135,7 +135,7 @@ v3dv-rpi4-vk-full:arm64: timeout: 2h variables: # Keep 10 minutes for boot + setup + uploading the artifacts at the end - TEST_PHASE_TIMEOUT: 110 + TEST_PHASE_TIMEOUT_MINUTES: 110 DEQP_FRACTION: 1 v3dv-rpi4-vk-asan:arm64: @@ -168,7 +168,7 @@ v3d-rpi5-gl-full:arm64: - igalia-fullrun timeout: 1h # usually takes around 48min variables: - TEST_PHASE_TIMEOUT: 50 # usually takes around 46min + TEST_PHASE_TIMEOUT_MINUTES: 50 # usually takes around 46min DEQP_FRACTION: 1 v3d-rpi5-rusticl:arm64: @@ -182,7 +182,7 @@ v3d-rpi5-rusticl:arm64: timeout: 20m # base run time = 7min test, 9min total variables: DEQP_SUITE: v3d-rusticl - TEST_PHASE_TIMEOUT: 15 + TEST_PHASE_TIMEOUT_MINUTES: 15 v3d-rpi5-traces:arm64: extends: @@ -221,5 +221,5 @@ v3dv-rpi5-vk-full:arm64: timeout: 2h variables: # Keep 10 minutes for boot + setup + uploading the artifacts at the end - TEST_PHASE_TIMEOUT: 170 + TEST_PHASE_TIMEOUT_MINUTES: 170 DEQP_FRACTION: 1 diff --git a/src/gallium/drivers/nouveau/ci/gitlab-ci.yml b/src/gallium/drivers/nouveau/ci/gitlab-ci.yml index 6bb11fc494a..2ef381fd459 100644 --- a/src/gallium/drivers/nouveau/ci/gitlab-ci.yml +++ b/src/gallium/drivers/nouveau/ci/gitlab-ci.yml @@ -23,7 +23,7 @@ gk20a-gles: variables: HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" DEQP_SUITE: nouveau-gm20b - TEST_PHASE_TIMEOUT: 120 + TEST_PHASE_TIMEOUT_MINUTES: 120 .gm20b-gles: extends: