mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
automation: introduce TEST_TIMEOUT_OVERRIDE
TEST_TIMEOUT is set as a CI/CD project variable, as it should be, to match the capability and speed of the testing infrastructure. As it turns out, TEST_TIMEOUT defined in test.yaml cannot override TEST_TIMEOUT defined as CI/CD project variable. As a consequence, today the TEST_TIMEOUT setting in test.yaml for the Xilinx jobs is ignored. Instead, rename TEST_TIMEOUT to TEST_TIMEOUT_OVERRIDE in test.yaml and check for TEST_TIMEOUT_OVERRIDE first in console.exp. Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com> Reviewed-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
This commit is contained in:
1 parent
163338e6fb
commit
d82e0e094e
2 files changed
+5
-3
No files matched your search
@@ -84,7 +84,7 @@
|
||||
variables:
|
||||
CONTAINER: ubuntu:xenial-xilinx
|
||||
LOGFILE: qemu-smoke-xilinx.log
|
||||
TEST_TIMEOUT: 120
|
||||
TEST_TIMEOUT_OVERRIDE: 120
|
||||
artifacts:
|
||||
paths:
|
||||
- smoke.serial
|
||||
@@ -104,7 +104,7 @@
|
||||
LOGFILE: xilinx-smoke-x86_64.log
|
||||
XEN_CMD_CONSOLE: "console=com2 com2=57600,8n1,0x2F8,4"
|
||||
TEST_BOARD: "crater"
|
||||
TEST_TIMEOUT: 1000
|
||||
TEST_TIMEOUT_OVERRIDE: 1000
|
||||
artifacts:
|
||||
paths:
|
||||
- smoke.serial
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#!/usr/bin/expect -f
|
||||
|
||||
if {[info exists env(TEST_TIMEOUT)]} {
|
||||
if {[info exists env(TEST_TIMEOUT_OVERRIDE)]} {
|
||||
set timeout $env(TEST_TIMEOUT_OVERRIDE)
|
||||
} elseif {[info exists env(TEST_TIMEOUT)]} {
|
||||
set timeout $env(TEST_TIMEOUT)
|
||||
} else {
|
||||
set timeout 1500
|
||||
|
||||