Message ID | 20201206185508.3545711-5-philmd@redhat.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | gitlab-ci: Add accelerator-specific Linux jobs | expand |
On 06/12/2020 19.55, Philippe Mathieu-Daudé wrote: > Cross-build ARM aarch64 target with KVM and TCG accelerators enabled. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > later this job will build KVM-only. > --- > .gitlab-ci.d/crossbuilds-kvm-arm.yml | 5 +++++ > .gitlab-ci.yml | 1 + > MAINTAINERS | 1 + > 3 files changed, 7 insertions(+) > create mode 100644 .gitlab-ci.d/crossbuilds-kvm-arm.yml > > diff --git a/.gitlab-ci.d/crossbuilds-kvm-arm.yml b/.gitlab-ci.d/crossbuilds-kvm-arm.yml > new file mode 100644 > index 00000000000..c74c6fdc9fb > --- /dev/null > +++ b/.gitlab-ci.d/crossbuilds-kvm-arm.yml > @@ -0,0 +1,5 @@ > +cross-arm64-kvm: > + extends: .cross_accel_build_job > + variables: > + IMAGE: debian-arm64-cross > + TARGETS: aarch64-softmmu Now that's a little bit surprising, I had expected that the KVM code is already compiled by the "cross-arm64-system" job ... but looking at the output of a corresponding pipeline, it says "KVM support: NO", see e.g.: https://gitlab.com/qemu-project/qemu/-/jobs/883985039#L298 What's going wrong there? ... ah, well, it's because of the "--target-list-exclude=aarch64-softmmu" in the template :-( That was stupid. So instead of adding a new job, could you please simply replace the aarch64-softmmu there by arm-softmmu? Thanks, Thomas
diff --git a/.gitlab-ci.d/crossbuilds-kvm-arm.yml b/.gitlab-ci.d/crossbuilds-kvm-arm.yml new file mode 100644 index 00000000000..c74c6fdc9fb --- /dev/null +++ b/.gitlab-ci.d/crossbuilds-kvm-arm.yml @@ -0,0 +1,5 @@ +cross-arm64-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-arm64-cross + TARGETS: aarch64-softmmu diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cdfa1f82a3d..573afceb3c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,7 @@ include: - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' .native_build_job_template: &native_build_job_definition stage: build diff --git a/MAINTAINERS b/MAINTAINERS index 8d7e2fdb7e2..40271eba592 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -386,6 +386,7 @@ M: Peter Maydell <peter.maydell@linaro.org> L: qemu-arm@nongnu.org S: Maintained F: target/arm/kvm.c +F: .gitlab-ci.d/crossbuilds-kvm-arm.yml MIPS KVM CPUs M: Huacai Chen <chenhc@lemote.com>
Cross-build ARM aarch64 target with KVM and TCG accelerators enabled. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- later this job will build KVM-only. --- .gitlab-ci.d/crossbuilds-kvm-arm.yml | 5 +++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 7 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-arm.yml