On 11/8/20 8:19 PM, Philippe Mathieu-Daudé wrote:
Extract the common definitions shared by '.native_build_job' and '.native_test_job' to '.native_common_job'. Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4526323169..f708573884e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,9 +13,12 @@ include: - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml'-.native_build_job:- stage: build +.native_common_job: image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
Do you envision that "native_common_job" with more common properties? Asking because it creates another indirection to just replace two "image"s. Anyway, Reviewed-by: Wainer dos Santos Moschetta <waine...@redhat.com>
+ +.native_build_job: + extends: .native_common_job + stage: build before_script: - JOBS=$(expr $(nproc) + 1) - sed -i s,git.qemu.org/git,gitlab.com/qemu-project, .gitmodules @@ -35,8 +38,8 @@ include: fi.native_test_job:+ extends: .native_common_job stage: test - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: - cd build - find . -type f -exec touch {} +
