| Message ID | 20201108221925.2344515-8-philmd@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3,01/11] gitlab-ci: Drop generic cache rule | expand |
On 11/8/20 8:19 PM, Philippe Mathieu-Daudé wrote: > 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(-) Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> > > 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
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
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(-)