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
check-cfi-aarch64:
extends: .native_test_job_template
@@ -398,16 +397,15 @@ build-cfi-ppc64-s390x:
--enable-safe-stack --enable-slirp=git
TARGETS: ppc64-softmmu s390x-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: 80m
+ artifacts:
+ expire_in: 2 days
+ paths:
+ - build
check-cfi-ppc64-s390x:
extends: .native_test_job_template
--
2.30.2
