summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2020-12-07 14:15:02 +0100
committerThomas Huth2020-12-09 08:04:34 +0100
commitb16999a32c1ac6b99b1ab1e4183cfb7972e13bf7 (patch)
treecef225e3599ad0935fb82bacbffc70a18332cd90
parentgitlab-ci: Introduce 'cross_accel_build_job' template (diff)
downloadqemu-b16999a32c1ac6b99b1ab1e4183cfb7972e13bf7.tar.gz
qemu-b16999a32c1ac6b99b1ab1e4183cfb7972e13bf7.tar.xz
qemu-b16999a32c1ac6b99b1ab1e4183cfb7972e13bf7.zip
gitlab-ci: Add KVM s390x cross-build jobs
Cross-build s390x target with only KVM accelerator enabled. Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20201207131503.3858889-5-philmd@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--.gitlab-ci.d/crossbuilds.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index b59516301f..51896bbc9f 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -1,4 +1,3 @@
-
.cross_system_build_job:
stage: build
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
@@ -120,6 +119,12 @@ cross-s390x-user:
variables:
IMAGE: debian-s390x-cross
+cross-s390x-kvm-only:
+ extends: .cross_accel_build_job
+ variables:
+ IMAGE: debian-s390x-cross
+ ACCEL_CONFIGURE_OPTS: --disable-tcg
+
cross-win32-system:
extends: .cross_system_build_job
variables: