On 13/06/2022 23.46, Richard Henderson wrote:
On 6/13/22 10:12, Alex Bennée wrote:
From: Thomas Huth <th...@redhat.com>
The job definitions recently got a second "variables:" section by
accident and thus are failing now if one tries to run them. Merge
the two sections into one again to fix the issue.
And while we're at it, bump the timeout here (70 minutes are currently
not enough for the aarch64 job). The jobs are marked as manual anyway,
so if the user starts them, they want to see their result for sure and
then it's annoying if the job timeouts too early.
Fixes: e312d1fdbb ("gitlab: convert build/container jobs to
.base_job_template")
Signed-off-by: Thomas Huth <th...@redhat.com>
Acked-by: Richard Henderson <richard.hender...@linaro.org>
Message-Id: <20220603124809.70794-1-th...@redhat.com>
Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
---
.gitlab-ci.d/buildtest.yml | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 544385f5be..cb7cad44b5 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -357,16 +357,15 @@ build-cfi-aarch64:
--enable-safe-stack --enable-slirp=git
TARGETS: aarch64-softmmu
MAKE_CHECK_ARGS: check-build
- timeout: 70m
- artifacts:
- expire_in: 2 days
- paths:
- - build
- variables:
# FIXME: This job is often failing, likely due to out-of-memory
problems in
# the constrained containers of the shared runners. Thus this is
marked as
# skipped until the situation has been solved.
QEMU_JOB_SKIPPED: 1
+ timeout: 90m
+ artifacts:
+ expire_in: 2 days
+ paths:
+ - build
FWIW, 90 minutes was close, but insufficient:
https://gitlab.com/qemu-project/qemu/-/jobs/2584472225
Hmm, it was working at least once for me while I was working on the patch.
But as I already wrote here:
https://lists.gnu.org/archive/html/qemu-devel/2022-06/msg00463.html
I think nobody really used this build-cfi-aarch64 in month ... so we should
maybe have a try with the 90 min timeout first (maybe the CI servers were
just a little bit overloaded when you tried), but if the test continues to
hit the 90 minutes timeout, I'd say we rather delete it instead of bumping
the timeout even further. 90 minutes are really very close to the pain level
already - at least for me.
But certainly, let us fix the job definition:
Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
Thanks!
Thomas