Build jobs include the 'native_build_job' template. Move
the 'artifacts expiry' rule there. Now all build jobs benefit
from it.
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
---
.gitlab-ci.yml | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index debd4dea4fd..9c9a8584e4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,6 +74,10 @@ include:
then
make -j"$JOBS" $MAKE_CHECK_ARGS ;
fi
+ artifacts:
+ expire_in: 2 days
+ paths:
+ - build
.native_test_job:
extends: .native_common_job
@@ -116,10 +120,6 @@ build-system-ubuntu:
TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu
moxie-softmmu microblazeel-softmmu mips64el-softmmu
MAKE_CHECK_ARGS: check-build
- artifacts:
- expire_in: 2 days
- paths:
- - build
check-system-ubuntu:
extends: .native_test_job
@@ -146,10 +146,6 @@ build-system-debian:
TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu
riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu
MAKE_CHECK_ARGS: check-build
- artifacts:
- expire_in: 2 days
- paths:
- - build
check-system-debian:
extends: .native_test_job
@@ -177,10 +173,6 @@ build-system-fedora:
TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu
xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu
MAKE_CHECK_ARGS: check-build
- artifacts:
- expire_in: 2 days
- paths:
- - build
check-system-fedora:
extends: .native_test_job
@@ -208,10 +200,6 @@ build-system-centos:
TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu
x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu
MAKE_CHECK_ARGS: check-build
- artifacts:
- expire_in: 2 days
- paths:
- - build
check-system-centos:
extends: .native_test_job
@@ -312,10 +300,6 @@ build-deprecated:
MAKE_CHECK_ARGS: build-tcg
TARGETS: ppc64abi32-linux-user tilegx-linux-user lm32-softmmu
unicore32-softmmu
- artifacts:
- expire_in: 2 days
- paths:
- - build
# We split the check-tcg step as test failures are expected but we still
# want to catch the build breaking.
--
2.26.2
