ci: Let manual LAVA jobs have a longer timeout than others
So far only LAVA jobs make use of it, but I guess baremetal could be extended to have these timeouts as well. Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Reviewed-by: Emma Anholt <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13441>
This commit is contained in:
parent
dedc149307
commit
83a0bb007f
|
@ -1292,6 +1292,7 @@ debian-mingw32-x86_64:
|
||||||
- when: never
|
- when: never
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
|
JOB_TIMEOUT: 80
|
||||||
|
|
||||||
# The above .test-manual rules doesn't allow the jobs to be available for MRs
|
# The above .test-manual rules doesn't allow the jobs to be available for MRs
|
||||||
# but we should have an option to have manual jobs in MRs as well.
|
# but we should have an option to have manual jobs in MRs as well.
|
||||||
|
@ -1305,6 +1306,7 @@ debian-mingw32-x86_64:
|
||||||
- when: never
|
- when: never
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
|
JOB_TIMEOUT: 80
|
||||||
|
|
||||||
.baremetal-test:
|
.baremetal-test:
|
||||||
extends:
|
extends:
|
||||||
|
|
|
@ -34,6 +34,7 @@ artifacts/lava/lava_job_submitter.py \
|
||||||
--mesa-build-url "${FDO_HTTP_CACHE_URI:-}https://${MESA_BUILD_PATH}" \
|
--mesa-build-url "${FDO_HTTP_CACHE_URI:-}https://${MESA_BUILD_PATH}" \
|
||||||
--job-rootfs-overlay-url "${FDO_HTTP_CACHE_URI:-}https://${JOB_ROOTFS_OVERLAY_PATH}" \
|
--job-rootfs-overlay-url "${FDO_HTTP_CACHE_URI:-}https://${JOB_ROOTFS_OVERLAY_PATH}" \
|
||||||
--job-artifacts-base ${JOB_ARTIFACTS_BASE} \
|
--job-artifacts-base ${JOB_ARTIFACTS_BASE} \
|
||||||
|
--job-timeout ${JOB_TIMEOUT:-30} \
|
||||||
--first-stage-init artifacts/ci-common/init-stage1.sh \
|
--first-stage-init artifacts/ci-common/init-stage1.sh \
|
||||||
--ci-project-dir ${CI_PROJECT_DIR} \
|
--ci-project-dir ${CI_PROJECT_DIR} \
|
||||||
--device-type ${DEVICE_TYPE} \
|
--device-type ${DEVICE_TYPE} \
|
||||||
|
|
|
@ -71,7 +71,7 @@ def generate_lava_yaml(args):
|
||||||
},
|
},
|
||||||
'timeouts': {
|
'timeouts': {
|
||||||
'job': {
|
'job': {
|
||||||
'minutes': 30
|
'minutes': args.job_timeout
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -111,7 +111,7 @@ def generate_lava_yaml(args):
|
||||||
# skeleton test definition: only declaring each job as a single 'test'
|
# skeleton test definition: only declaring each job as a single 'test'
|
||||||
# since LAVA's test parsing is not useful to us
|
# since LAVA's test parsing is not useful to us
|
||||||
test = {
|
test = {
|
||||||
'timeout': { 'minutes': 30 },
|
'timeout': { 'minutes': args.job_timeout },
|
||||||
'failure_retry': 1,
|
'failure_retry': 1,
|
||||||
'definitions': [ {
|
'definitions': [ {
|
||||||
'name': 'mesa',
|
'name': 'mesa',
|
||||||
|
@ -332,6 +332,7 @@ if __name__ == '__main__':
|
||||||
parser.add_argument("--mesa-build-url")
|
parser.add_argument("--mesa-build-url")
|
||||||
parser.add_argument("--job-rootfs-overlay-url")
|
parser.add_argument("--job-rootfs-overlay-url")
|
||||||
parser.add_argument("--job-artifacts-base")
|
parser.add_argument("--job-artifacts-base")
|
||||||
|
parser.add_argument("--job-timeout", type=int)
|
||||||
parser.add_argument("--first-stage-init")
|
parser.add_argument("--first-stage-init")
|
||||||
parser.add_argument("--ci-project-dir")
|
parser.add_argument("--ci-project-dir")
|
||||||
parser.add_argument("--device-type")
|
parser.add_argument("--device-type")
|
||||||
|
|
Loading…
Reference in New Issue