[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 08/11] gitlab-ci: Extract common job definition as 'native_com
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 08/11] gitlab-ci: Extract common job definition as 'native_common_job' |
Date: |
Sun, 8 Nov 2020 23:19:22 +0100 |
Extract the common definitions shared by '.native_build_job'
and '.native_test_job' to '.native_common_job'.
Signed-off-by: Philippe Mathieu-Daudé <philmd@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
+
+.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 {} +
--
2.26.2
[PATCH v3 07/11] gitlab-ci: Extract common job definition as 'cross_common_job', Philippe Mathieu-Daudé, 2020/11/08
[PATCH v3 08/11] gitlab-ci: Extract common job definition as 'native_common_job',
Philippe Mathieu-Daudé <=
[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