[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/11] gitlab-ci: Extract common job definition as 'cross_comm
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 07/11] gitlab-ci: Extract common job definition as 'cross_common_job' |
Date: |
Sun, 8 Nov 2020 23:19:21 +0100 |
Extract the common definitions shared by '.cross_system_build_job'
and '.cross_user_build_job' to '.cross_common_job'.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
.gitlab-ci.d/crossbuilds.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index 099949aaef3..701550f028c 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -1,7 +1,9 @@
-
-.cross_system_build_job:
+.cross_common_job:
stage: build
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
+
+.cross_system_build_job:
+ extends: .cross_common_job
timeout: 80m
script:
- mkdir build
@@ -14,8 +16,7 @@
- make -j$(expr $(nproc) + 1) all check-build
.cross_user_build_job:
- stage: build
- image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
+ extends: .cross_common_job
script:
- mkdir build
- cd build
--
2.26.2
[PATCH v3 07/11] gitlab-ci: Extract common job definition as 'cross_common_job',
Philippe Mathieu-Daudé <=
[PATCH v3 08/11] gitlab-ci: Extract common job definition as 'native_common_job', Philippe Mathieu-Daudé, 2020/11/08
[PATCH v3 09/11] gitlab-ci: Add rules to select cross-jobs to build, Philippe Mathieu-Daudé, 2020/11/08
[PATCH v3 10/11] gitlab-ci: Add rules to select building/testing native jobs, Philippe Mathieu-Daudé, 2020/11/08
[PATCH v3 11/11] gitlab-ci: Move artifacts expiry rule to common 'native_build_job', Philippe Mathieu-Daudé, 2020/11/08