gitlab: move .meson_job_template into base.yaml
Rename .meson_job_template to .base_meson_job_template and move it into base.yml, in prep for wider reuse. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> Link: https://lore.kernel.org/qemu-devel/20260624124657.2725376-3-berrange@redhat.com Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Daniel P. Berrangé committed
Jun 24, 2026 at 13:46 UTC
4fa56eaa75742404e5554240eb25071b872d9270
2 files changed
+17
-17
.gitlab-ci.d/base.yml
+14
@@ -134,3 +134,17 @@ variables:
134
QEMU_CI_CONTAINER_TAG: $CI_COMMIT_REF_SLUG
135
136
- when: on_success
137
+
138
+# Any job running meson should capture meson logs
139
+# by default. Some jobs might override the artifacts
140
+# to capture further files
141
+.base_meson_job_template:
142
+ extends: .base_job_template
143
+ artifacts:
144
+ name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
145
+ when: always
146
+ expire_in: 7 days
147
+ paths:
148
+ - build/meson-logs
149
+ reports:
150
+ junit: build/meson-logs/*.junit.xml
.gitlab-ci.d/buildtest-template.yml
+3
-17
@@ -1,20 +1,6 @@
1
2
-# Any job running meson should capture meson logs
3
-# by default. Some jobs might override the artifacts
4
-# to capture further files
5
-.meson_job_template:
6
- extends: .base_job_template
7
- artifacts:
8
- name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
9
- when: always
10
- expire_in: 7 days
11
- paths:
12
- - build/meson-logs
13
- reports:
14
- junit: build/meson-logs/*.junit.xml
15
-
2
.native_build_job_template:
17
- extends: .meson_job_template
3
+ extends: .base_meson_job_template
4
stage: build
5
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG
6
cache:
@@ -75,7 +61,7 @@
61
- build/**/*.c.o.d
62
63
.common_test_job_template:
78
- extends: .meson_job_template
64
+ extends: .base_meson_job_template
65
stage: test
66
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG
67
script:
@@ -133,7 +119,7 @@
119
QEMU_JOB_FUNCTIONAL: 1
120
121
.wasm_build_job_template:
136
- extends: .meson_job_template
122
+ extends: .base_meson_job_template
123
stage: build
124
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG
125
before_script: