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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30409>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user