[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/15] gitlab-ci: Extract crossbuild job templates to crossbuild-
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 07/15] gitlab-ci: Extract crossbuild job templates to crossbuild-template.yml |
Date: |
Mon, 19 Apr 2021 01:34:40 +0200 |
Extract the crossbuild job templates to a new file
(crossbuild-template.yml) to be able to reuse them
without having to run all the jobs included, which
are mainly useful for mainstream CI.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
.gitlab-ci.d/crossbuild-template.yml | 41 ++++++++++++++++++++++++++
.gitlab-ci.d/crossbuilds.yml | 43 ++--------------------------
2 files changed, 43 insertions(+), 41 deletions(-)
create mode 100644 .gitlab-ci.d/crossbuild-template.yml
diff --git a/.gitlab-ci.d/crossbuild-template.yml
b/.gitlab-ci.d/crossbuild-template.yml
new file mode 100644
index 00000000000..bc790a43486
--- /dev/null
+++ b/.gitlab-ci.d/crossbuild-template.yml
@@ -0,0 +1,41 @@
+.cross_system_build_job:
+ stage: build
+ image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
+ timeout: 80m
+ script:
+ - mkdir build
+ - cd build
+ - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+ ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+ --disable-user --target-list-exclude="arm-softmmu cris-softmmu
+ i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
+ mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu"
+ - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
+
+# Job to cross-build specific accelerators.
+#
+# Set the $ACCEL variable to select the specific accelerator (default to
+# KVM), and set extra options (such disabling other accelerators) via the
+# $ACCEL_CONFIGURE_OPTS variable.
+.cross_accel_build_job:
+ stage: build
+ image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
+ timeout: 30m
+ script:
+ - mkdir build
+ - cd build
+ - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+ ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+ --disable-tools --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS
+ - make -j$(expr $(nproc) + 1) all check-build
+
+.cross_user_build_job:
+ stage: build
+ image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
+ script:
+ - mkdir build
+ - cd build
+ - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+ ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+ --disable-system
+ - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index 2d95784ed51..7a0d2069c14 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -1,44 +1,5 @@
-.cross_system_build_job:
- stage: build
- image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
- timeout: 80m
- script:
- - mkdir build
- - cd build
- - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
- ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
- --disable-user --target-list-exclude="arm-softmmu cris-softmmu
- i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
- mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu"
- - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
-
-# Job to cross-build specific accelerators.
-#
-# Set the $ACCEL variable to select the specific accelerator (default to
-# KVM), and set extra options (such disabling other accelerators) via the
-# $ACCEL_CONFIGURE_OPTS variable.
-.cross_accel_build_job:
- stage: build
- image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
- timeout: 30m
- script:
- - mkdir build
- - cd build
- - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
- ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
- --disable-tools --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS
- - make -j$(expr $(nproc) + 1) all check-build
-
-.cross_user_build_job:
- stage: build
- image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
- script:
- - mkdir build
- - cd build
- - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
- ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
- --disable-system
- - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
+include:
+ - local: '/.gitlab-ci.d/crossbuild-template.yml'
cross-armel-system:
extends: .cross_system_build_job
--
2.26.3
- [RFC PATCH 00/15] gitlab-ci: Allow forks to use different pipelines than mainstream, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 01/15] gitlab-ci: Replace YAML anchors by extends (container_job), Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 02/15] gitlab-ci: Replace YAML anchors by extends (native_build_job), Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 03/15] gitlab-ci: Replace YAML anchors by extends (native_test_job), Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 04/15] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job), Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 05/15] gitlab-ci: Rename acceptance_test_job -> integration_test_job, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 06/15] gitlab-ci: Extract container job template to container-template.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 07/15] gitlab-ci: Extract crossbuild job templates to crossbuild-template.yml,
Philippe Mathieu-Daudé <=
- [PATCH 08/15] gitlab-ci: Extract DCO/style check jobs to checks.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 09/15] gitlab-ci: Extract build stages to stages.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 10/15] gitlab-ci: Extract all default build/test jobs to buildtest.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 11/15] gitlab-ci: Extract core container jobs to container-core.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 12/15] gitlab-ci: Move current job set to qemu-project.yml, Philippe Mathieu-Daudé, 2021/04/18