Mesa (staging/21.3): ci: Let manual LAVA jobs have a longer timeout than others
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Nov 4 23:18:38 UTC 2021
Module: Mesa
Branch: staging/21.3
Commit: 3bce454bc37f15d1596b9b804a46e30cb7256308
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3bce454bc37f15d1596b9b804a46e30cb7256308
Author: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Date: Fri Oct 22 16:23:21 2021 +0200
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 at collabora.com>
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13441>
(cherry picked from commit 83a0bb007fd88c75d8a05896af06bf20b9f3ccd2)
---
.gitlab-ci.yml | 2 ++
.gitlab-ci/lava/lava-submit.sh | 1 +
.gitlab-ci/lava/lava_job_submitter.py | 5 +++--
.pick_status.json | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 089fb02ca1b..76996a1413e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1292,6 +1292,7 @@ debian-mingw32-x86_64:
- when: never
variables:
GIT_STRATEGY: none
+ JOB_TIMEOUT: 80
# 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.
@@ -1305,6 +1306,7 @@ debian-mingw32-x86_64:
- when: never
variables:
GIT_STRATEGY: none
+ JOB_TIMEOUT: 80
.baremetal-test:
extends:
diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh
index 2596679276c..1d3a2453144 100755
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -34,6 +34,7 @@ artifacts/lava/lava_job_submitter.py \
--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-artifacts-base ${JOB_ARTIFACTS_BASE} \
+ --job-timeout ${JOB_TIMEOUT:-30} \
--first-stage-init artifacts/ci-common/init-stage1.sh \
--ci-project-dir ${CI_PROJECT_DIR} \
--device-type ${DEVICE_TYPE} \
diff --git a/.gitlab-ci/lava/lava_job_submitter.py b/.gitlab-ci/lava/lava_job_submitter.py
index a8f2ace8ded..bf2032c4fe6 100755
--- a/.gitlab-ci/lava/lava_job_submitter.py
+++ b/.gitlab-ci/lava/lava_job_submitter.py
@@ -71,7 +71,7 @@ def generate_lava_yaml(args):
},
'timeouts': {
'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'
# since LAVA's test parsing is not useful to us
test = {
- 'timeout': { 'minutes': 30 },
+ 'timeout': { 'minutes': args.job_timeout },
'failure_retry': 1,
'definitions': [ {
'name': 'mesa',
@@ -332,6 +332,7 @@ if __name__ == '__main__':
parser.add_argument("--mesa-build-url")
parser.add_argument("--job-rootfs-overlay-url")
parser.add_argument("--job-artifacts-base")
+ parser.add_argument("--job-timeout", type=int)
parser.add_argument("--first-stage-init")
parser.add_argument("--ci-project-dir")
parser.add_argument("--device-type")
diff --git a/.pick_status.json b/.pick_status.json
index 4894cd17289..4ac2c9a06ab 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1003,7 +1003,7 @@
"description": "ci: Let manual LAVA jobs have a longer timeout than others",
"nominated": false,
"nomination_type": null,
- "resolution": 4,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
More information about the mesa-commit
mailing list