gitlab-ci: Add accelerator-specific Linux jobs
cover gitlab-ci: Add accelerator-specific Linux jobs
Hi,
I was custom to use Travis-CI for testing KVM builds on s390x/ppc with the Travis-CI jobs.
During October Travis-CI became unusable for me (extremely slow, see [1]). Then my free Travis account got updated to the new "10K credit minutes allotment" [2] which I burned without reading the notification email in time (I'd burn them eventually anyway).
Today Travis-CI is pointless to me. While I could pay to run my QEMU jobs, I don't think it is fair for an Open Source project to ask its forks to pay for a service.
As we want forks to run some CI before contributing patches, and we have cross-build Docker images available for Linux hosts, I added some cross KVM/Xen build jobs to Gitlab-CI.
Cross-building doesn't have the same coverage as native building, as we can not run the tests. But this is still useful to get link failures.
Each job is added in its own YAML file, so it is easier to notify subsystem maintainers in case of troubles.
Resulting pipeline:
https://gitlab.com/philmd/qemu/-/pipelines/225948077
Regards,
Phil.
[1] https://travis-ci.community/t/build-delays-for-open-source-project/10272
[2] https://blog.travis-ci.com/2020-11-02-travis-ci-new-billing
Philippe Mathieu-Daudé (8):
gitlab-ci: Replace YAML anchors by extends (cross_system_build_job)
gitlab-ci: Introduce 'cross_accel_build_job' template
gitlab-ci: Add KVM X86 cross-build jobs
gitlab-ci: Add KVM ARM cross-build jobs
gitlab-ci: Add KVM s390x cross-build jobs
gitlab-ci: Add KVM PPC cross-build jobs
gitlab-ci: Add KVM MIPS cross-build jobs
gitlab-ci: Add Xen cross-build jobs
.gitlab-ci.d/crossbuilds-kvm-arm.yml | 5 +++ .gitlab-ci.d/crossbuilds-kvm-mips.yml | 5 +++ .gitlab-ci.d/crossbuilds-kvm-ppc.yml | 5 +++ .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 +++ .gitlab-ci.d/crossbuilds-kvm-x86.yml | 6 +++ .gitlab-ci.d/crossbuilds-xen.yml | 14 +++++++ .gitlab-ci.d/crossbuilds.yml | 52 ++++++++++++++++---------- .gitlab-ci.yml | 6 +++ MAINTAINERS | 6 +++ 9 files changed, 85 insertions(+), 20 deletions(-) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-arm.yml create mode 100644 .gitlab-ci.d/crossbuilds-kvm-mips.yml create mode 100644 .gitlab-ci.d/crossbuilds-kvm-ppc.yml create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml create mode 100644 .gitlab-ci.d/crossbuilds-kvm-x86.yml create mode 100644 .gitlab-ci.d/crossbuilds-xen.yml
Signature · 1 line
2.26.2
PATCH 1/8 gitlab-ci: Replace YAML anchors by extends (cross_system_build_job)
'extends' is an alternative to using YAML anchors
and is a little more flexible and readable. See:
https://docs.gitlab.com/ee/ci/yaml/#extends
More importantly it allows exploding YAML jobs.
--- .gitlab-ci.d/crossbuilds.yml | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-)
.gitlab-ci.d/crossbuilds.yml +20 -20
@@ -1,5 +1,5 @@ -.cross_system_build_job_template: &cross_system_build_job_definition +.cross_system_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest timeout: 80m
@@ -13,7 +13,7 @@ xtensa-softmmu" - make -j$(expr $(nproc) + 1) all check-build -.cross_user_build_job_template: &cross_user_build_job_definition +.cross_user_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script:
@@ -24,91 +24,91 @@ - make -j$(expr $(nproc) + 1) all check-build cross-armel-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-armel-cross cross-armel-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-armel-cross cross-armhf-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-armhf-cross cross-armhf-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-armhf-cross cross-arm64-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-arm64-cross cross-arm64-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-arm64-cross cross-mips-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-mips-cross cross-mips-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-mips-cross cross-mipsel-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-mipsel-cross cross-mipsel-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-mipsel-cross cross-mips64el-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-mips64el-cross cross-mips64el-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-mips64el-cross cross-ppc64el-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-ppc64el-cross cross-ppc64el-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-ppc64el-cross cross-s390x-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-s390x-cross cross-s390x-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-s390x-cross cross-win32-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: fedora-win32-cross cross-win64-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: fedora-win64-cross
Signature · 1 line
2.26.2
Re: [PATCH 1/8] gitlab-ci: Replace YAML anchors by extends (cross_system_build_job)
Quoted 11 lines · Philippe Mathieu-Daudé
'extends' is an alternative to using YAML anchors
and is a little more flexible and readable. See:
https://docs.gitlab.com/ee/ci/yaml/#extendsMore importantly it allows exploding YAML jobs.
Reviewed-by Wainer dos Santos Moschetta <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds.yml | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-)
PATCH 2/8 gitlab-ci: Introduce 'cross_accel_build_job' template
In reply to Philippe Mathieu-DaudéIntroduce a job template to cross-build accelerator specific jobs (enable a specific accelerator, disabling the others).
--- .gitlab-ci.d/crossbuilds.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+)
.gitlab-ci.d/crossbuilds.yml +12 -0
@@ -13,6 +13,18 @@ xtensa-softmmu" - make -j$(expr $(nproc) + 1) all check-build +.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 $QEMU_CONFIGURE_OPTS --disable-tools + --enable-${ACCEL:-kvm} --target-list="$TARGETS" $ACCEL_CONFIGURE_OPTS + - make -j$(expr $(nproc) + 1) all check-build + .cross_user_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
Signature · 1 line
2.26.2
Re: [PATCH 2/8] gitlab-ci: Introduce 'cross_accel_build_job' template
Quoted 22 lines · Philippe Mathieu-Daudé
Introduce a job template to cross-build accelerator specific jobs (enable a specific accelerator, disabling the others).
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+).gitlab-ci.d/crossbuilds.yml +5
-0@@ -13,6 +13,18 @@ xtensa-softmmu" - make -j$(expr $(nproc) + 1) all check-build +.cross_accel_build_job: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 30m + script:
.gitlab-ci.d/crossbuilds.yml line 30
Quoted 10 lines
.gitlab-ci.d/crossbuilds.yml +7
-0+ - mkdir build + - cd build + - PKG_CONFIG_PATH=$PKG_CONFIG_PATH + ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-tools + --enable-${ACCEL:-kvm} --target-list="$TARGETS" $ACCEL_CONFIGURE_OPTS + - make -j$(expr $(nproc) + 1) all check-build + .cross_user_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
Hi Philippe,
probably I just don't understand how this works, but where is the "disabling the others" part?
I see the --enable-${ACCEL:-kvm}, but I would expect some --disable-XXX ?
I am probably just missing something..
Thanks,
Ciao,
Claudio
Re: [PATCH 2/8] gitlab-ci: Introduce 'cross_accel_build_job' template
Quoted 36 lines · Claudio Fontana
Quoted 22 lines · Philippe Mathieu-Daudé
Introduce a job template to cross-build accelerator specific jobs (enable a specific accelerator, disabling the others).
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+).gitlab-ci.d/crossbuilds.yml +5
-0@@ -13,6 +13,18 @@ xtensa-softmmu" - make -j$(expr $(nproc) + 1) all check-build +.cross_accel_build_job: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 30m + script:.gitlab-ci.d/crossbuilds.yml line 30
Quoted 10 lines
.gitlab-ci.d/crossbuilds.yml +7
-0+ - mkdir build + - cd build + - PKG_CONFIG_PATH=$PKG_CONFIG_PATH + ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-tools + --enable-${ACCEL:-kvm} --target-list="$TARGETS" $ACCEL_CONFIGURE_OPTS + - make -j$(expr $(nproc) + 1) all check-build + .cross_user_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latestHi Philippe,
Quoted 2 lines
probably I just don't understand how this works, but where is the "disabling the others" part?
Sorry I forgot to document $ACCEL_CONFIGURE_OPTS, which can be used to amend options. See x86 and s390x jobs (the only one buildable without TCG afaik) use:
ACCEL_CONFIGURE_OPTS: --disable-tcg
Quoted 4 lines
I see the --enable-${ACCEL:-kvm}, but I would expect some --disable-XXX ?
I am probably just missing something..
The goal of this series is not to test --disable-tcg, but to test --enable-kvm when you don't have access to a host arch. I see testing --disable-tcg as a bonus :)
Quoted 7 lines
Thanks,
Ciao,
Claudio
PATCH 3/8 gitlab-ci: Add KVM X86 cross-build jobs
In reply to Philippe Mathieu-DaudéCross-build x86 target with only KVM accelerator enabled.
--- .gitlab-ci.d/crossbuilds-kvm-x86.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-x86.yml
.gitlab-ci.d/crossbuilds-kvm-x86.yml new file +6 -0
@@ -0,0 +1,6 @@ +cross-amd64-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-amd64-cross + TARGETS: i386-softmmu,x86_64-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg
.gitlab-ci.yml +1 -0
@@ -12,6 +12,7 @@ include: - local: '/.gitlab-ci.d/opensbi.yml' - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' .native_build_job_template: &native_build_job_definition stage: build
MAINTAINERS +1 -0
@@ -427,6 +427,7 @@ L: [email protected] S: Supported F: target/i386/kvm.c F: scripts/kvm/vmxcap +F: .gitlab-ci.d/crossbuilds-kvm-x86.yml Guest CPU Cores (other accelerators) ------------------------------------
Signature · 1 line
2.26.2
Re: [PATCH 3/8] gitlab-ci: Add KVM X86 cross-build jobs
Quoted 9 lines · Philippe Mathieu-Daudé
Cross-build x86 target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-x86.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-x86.yml
We already have a job that tests with KVM enabled and TCG disabled in the main .gitlab-ci.yml file, the "build-tcg-disabled" job. So I don't quite see the point in adding yet another job that does pretty much the same? Did I miss something?
Thomas
Re: [PATCH 3/8] gitlab-ci: Add KVM X86 cross-build jobs
Quoted 11 lines · Thomas Huth
Quoted 9 lines · Philippe Mathieu-Daudé
Cross-build x86 target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-x86.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-x86.yml
Quoted 4 lines
We already have a job that tests with KVM enabled and TCG disabled in the main .gitlab-ci.yml file, the "build-tcg-disabled" job. So I don't quite see the point in adding yet another job that does pretty much the same? Did I miss something?
I missed it was x86-specific myself.
Quoted 3 lines
Thomas
PATCH 4/8 gitlab-ci: Add KVM ARM cross-build jobs
In reply to Philippe Mathieu-DaudéCross-build ARM aarch64 target with KVM and TCG accelerators enabled.
---
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
.gitlab-ci.d/crossbuilds-kvm-arm.yml new file +5 -0
@@ -0,0 +1,5 @@ +cross-arm64-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-arm64-cross + TARGETS: aarch64-softmmu
.gitlab-ci.yml +1 -0
@@ -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
MAINTAINERS +1 -0
@@ -386,6 +386,7 @@ M: Peter Maydell <[email protected]> L: [email protected] S: Maintained F: target/arm/kvm.c +F: .gitlab-ci.d/crossbuilds-kvm-arm.yml MIPS KVM CPUs M: Huacai Chen <[email protected]>
Signature · 1 line
2.26.2
Re: [PATCH 4/8] gitlab-ci: Add KVM ARM cross-build jobs
Quoted 18 lines · Philippe Mathieu-Daudé
Cross-build ARM aarch64 target with KVM and TCG accelerators enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
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.gitlab-ci.d/crossbuilds-kvm-arm.yml new file +0
-0
.gitlab-ci.d/crossbuilds-kvm-arm.yml line 5
Quoted 5 lines
.gitlab-ci.d/crossbuilds-kvm-arm.yml new file +5
-0@@ -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
PATCH 5/8 gitlab-ci: Add KVM s390x cross-build jobs
In reply to Philippe Mathieu-DaudéCross-build s390x target with only KVM accelerator enabled.
--- .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml
.gitlab-ci.d/crossbuilds-kvm-s390x.yml new file +6 -0
@@ -0,0 +1,6 @@ +cross-s390x-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-s390x-cross + TARGETS: s390x-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg
.gitlab-ci.yml +1 -0
@@ -14,6 +14,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml' .native_build_job_template: &native_build_job_definition stage: build
MAINTAINERS +1 -0
@@ -417,6 +417,7 @@ F: hw/intc/s390_flic.c F: hw/intc/s390_flic_kvm.c F: include/hw/s390x/s390_flic.h F: gdb-xml/s390*.xml +F: .gitlab-ci.d/crossbuilds-kvm-s390x.yml T: git https://github.com/cohuck/qemu.git s390-next T: git https://github.com/borntraeger/qemu.git s390-next L: [email protected]
Signature · 1 line
2.26.2
Re: [PATCH 5/8] gitlab-ci: Add KVM s390x cross-build jobs
Quoted 27 lines · Philippe Mathieu-Daudé
Cross-build s390x target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml.gitlab-ci.d/crossbuilds-kvm-s390x.yml new file +6
-0@@ -0,0 +1,6 @@ +cross-s390x-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-s390x-cross + TARGETS: s390x-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg.gitlab-ci.yml +0
-0
.gitlab-ci.yml include: · line 17
Quoted 4 lines
.gitlab-ci.yml +1
-0@@ -14,6 +14,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml'
KVM code is already covered by the "cross-s390x-system" job, but an additional compilation test with --disable-tcg makes sense here. I'd then rather name it "cross-s390x-no-tcg" or so instead of "cross-s390x-kvm".
And while you're at it, I'd maybe rather name the new file just crossbuilds-s390x.yml and also move the other s390x related jobs into it?
Thomas
Re: [PATCH 5/8] gitlab-ci: Add KVM s390x cross-build jobs
Quoted 28 lines · Thomas Huth
Quoted 27 lines · Philippe Mathieu-Daudé
Cross-build s390x target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml.gitlab-ci.d/crossbuilds-kvm-s390x.yml new file +6
-0@@ -0,0 +1,6 @@ +cross-s390x-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-s390x-cross + TARGETS: s390x-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg.gitlab-ci.yml +0
-0@@ -14,6 +14,7 @@ include:
Quoted 8 lines
.gitlab-ci.yml include: · line 17
Quoted 4 lines
.gitlab-ci.yml +1
-0- local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml'KVM code is already covered by the "cross-s390x-system" job, but an additional compilation test with --disable-tcg makes sense here. I'd then rather name it "cross-s390x-no-tcg" or so instead of "cross-s390x-kvm".
As you wish. What I want is to let Gitlab users be able to build the equivalent "[s390x] Clang (disable-tcg)" from Travis.
I keep using GCC toolchain because managing job coverage duplication is an unresolved problem.
Quoted 3 lines
And while you're at it, I'd maybe rather name the new file just crossbuilds-s390x.yml and also move the other s390x related jobs into it?
OK will do.
Thanks,
Phil.
Re: [PATCH 5/8] gitlab-ci: Add KVM s390x cross-build jobs
Quoted 29 lines · Philippe Mathieu-Daudé
Quoted 28 lines · Thomas Huth
Quoted 27 lines · Philippe Mathieu-Daudé
Cross-build s390x target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml.gitlab-ci.d/crossbuilds-kvm-s390x.yml new file +6
-0@@ -0,0 +1,6 @@ +cross-s390x-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-s390x-cross + TARGETS: s390x-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg.gitlab-ci.yml +0
-0@@ -14,6 +14,7 @@ include:
Quoted 8 lines
Quoted 8 lines
.gitlab-ci.yml include: · line 17
Quoted 4 lines
.gitlab-ci.yml +1
-0- local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml'KVM code is already covered by the "cross-s390x-system" job, but an additional compilation test with --disable-tcg makes sense here. I'd then rather name it "cross-s390x-no-tcg" or so instead of "cross-s390x-kvm".
What other accelerators are available on 390?
Quoted 17 lines
As you wish. What I want is to let Gitlab users be able to build the equivalent "[s390x] Clang (disable-tcg)" from Travis.
I keep using GCC toolchain because managing job coverage duplication is an unresolved problem.
Quoted 3 lines
And while you're at it, I'd maybe rather name the new file just crossbuilds-s390x.yml and also move the other s390x related jobs into it?
OK will do.
Thanks,
Phil.
Re: [PATCH 5/8] gitlab-ci: Add KVM s390x cross-build jobs
Quoted 39 lines · Philippe Mathieu-Daudé
Quoted 29 lines · Philippe Mathieu-Daudé
Quoted 28 lines · Thomas Huth
Quoted 27 lines · Philippe Mathieu-Daudé
Cross-build s390x target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml.gitlab-ci.d/crossbuilds-kvm-s390x.yml new file +6
-0@@ -0,0 +1,6 @@ +cross-s390x-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-s390x-cross + TARGETS: s390x-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg.gitlab-ci.yml +0
-0@@ -14,6 +14,7 @@ include:Quoted 8 lines
Quoted 8 lines
.gitlab-ci.yml include: · line 17
Quoted 4 lines
.gitlab-ci.yml +1
-0- local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml'KVM code is already covered by the "cross-s390x-system" job, but an additional compilation test with --disable-tcg makes sense here. I'd then rather name it "cross-s390x-no-tcg" or so instead of "cross-s390x-kvm".
Quoted 1 line
What other accelerators are available on 390?
It's only TCG and KVM.
Thomas
Re: [PATCH 5/8] gitlab-ci: Add KVM s390x cross-build jobs
Quoted 40 lines · Thomas Huth
Quoted 39 lines · Philippe Mathieu-Daudé
Quoted 37 lines · Philippe Mathieu-Daudé
Quoted 36 lines · Thomas Huth
Quoted 27 lines · Philippe Mathieu-Daudé
Cross-build s390x target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml.gitlab-ci.d/crossbuilds-kvm-s390x.yml new file +6
-0@@ -0,0 +1,6 @@ +cross-s390x-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-s390x-cross + TARGETS: s390x-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg.gitlab-ci.yml +0
-0.gitlab-ci.yml include: · line 17
Quoted 4 lines
.gitlab-ci.yml +1
-0@@ -14,6 +14,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml'KVM code is already covered by the "cross-s390x-system" job, but an additional compilation test with --disable-tcg makes sense here. I'd then rather name it "cross-s390x-no-tcg" or so instead of "cross-s390x-kvm".
Quoted 3 lines
Quoted 1 line
What other accelerators are available on 390?
It's only TCG and KVM.
Easy, so no-tcg = kvm :)
Re: [PATCH 5/8] gitlab-ci: Add KVM s390x cross-build jobs
In reply to Thomas HuthQuoted 37 lines · Thomas Huth
Quoted 27 lines · Philippe Mathieu-Daudé
Cross-build s390x target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml.gitlab-ci.d/crossbuilds-kvm-s390x.yml new file +6
-0@@ -0,0 +1,6 @@ +cross-s390x-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-s390x-cross + TARGETS: s390x-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg.gitlab-ci.yml +0
-0.gitlab-ci.yml include: · line 17
Quoted 4 lines
.gitlab-ci.yml +1
-0@@ -14,6 +14,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml'KVM code is already covered by the "cross-s390x-system" job, but an additional compilation test with --disable-tcg makes sense here. I'd then rather name it "cross-s390x-no-tcg" or so instead of "cross-s390x-kvm".
Quoted 2 lines
And while you're at it, I'd maybe rather name the new file just crossbuilds-s390x.yml and also move the other s390x related jobs into it?
I don't think we really should split it up so much - just put these jobs in the existing crosbuilds.yml file.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 5/8] gitlab-ci: Add KVM s390x cross-build jobs
Quoted 38 lines · Daniel P. Berrangé
Quoted 37 lines · Thomas Huth
Quoted 27 lines · Philippe Mathieu-Daudé
Cross-build s390x target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml.gitlab-ci.d/crossbuilds-kvm-s390x.yml new file +6
-0@@ -0,0 +1,6 @@ +cross-s390x-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-s390x-cross + TARGETS: s390x-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg.gitlab-ci.yml +0
-0.gitlab-ci.yml include: · line 17
Quoted 4 lines
.gitlab-ci.yml +1
-0@@ -14,6 +14,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml'KVM code is already covered by the "cross-s390x-system" job, but an additional compilation test with --disable-tcg makes sense here. I'd then rather name it "cross-s390x-no-tcg" or so instead of "cross-s390x-kvm".
Quoted 5 lines
Quoted 2 lines
And while you're at it, I'd maybe rather name the new file just crossbuilds-s390x.yml and also move the other s390x related jobs into it?
I don't think we really should split it up so much - just put these jobs in the existing crosbuilds.yml file.
Don't we want to leverage MAINTAINERS file?
Re: [PATCH 5/8] gitlab-ci: Add KVM s390x cross-build jobs
Quoted 39 lines · Philippe Mathieu-Daudé
Quoted 38 lines · Daniel P. Berrangé
Quoted 37 lines · Thomas Huth
Quoted 27 lines · Philippe Mathieu-Daudé
Cross-build s390x target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml.gitlab-ci.d/crossbuilds-kvm-s390x.yml new file +6
-0@@ -0,0 +1,6 @@ +cross-s390x-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-s390x-cross + TARGETS: s390x-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg.gitlab-ci.yml +0
-0.gitlab-ci.yml include: · line 17
Quoted 4 lines
.gitlab-ci.yml +1
-0@@ -14,6 +14,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml'KVM code is already covered by the "cross-s390x-system" job, but an additional compilation test with --disable-tcg makes sense here. I'd then rather name it "cross-s390x-no-tcg" or so instead of "cross-s390x-kvm".
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
And while you're at it, I'd maybe rather name the new file just crossbuilds-s390x.yml and also move the other s390x related jobs into it?
I don't think we really should split it up so much - just put these jobs in the existing crosbuilds.yml file.
Don't we want to leverage
MAINTAINERSfile?
As mentioned in the cover letter, I think this is mis-using the MAINTAINERS file to try to represent something different.
The MAINTAINERS file says who is responsible for the contents of the .yml file, which is the CI maintainers, because we want a consistent gitlab configuration as a whole, not everyone doing their own thing.
MAINTAINERS doesn't say who is responsible for making sure the actual jobs that run are passing, which is potentially a completely different person. If we want to track that, it is not the MAINTAINERS file.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 5/8] gitlab-ci: Add KVM s390x cross-build jobs
Quoted 51 lines · Daniel P. Berrangé
Quoted 39 lines · Philippe Mathieu-Daudé
Quoted 38 lines · Daniel P. Berrangé
Quoted 37 lines · Thomas Huth
Quoted 27 lines · Philippe Mathieu-Daudé
Cross-build s390x target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml.gitlab-ci.d/crossbuilds-kvm-s390x.yml new file +6
-0@@ -0,0 +1,6 @@ +cross-s390x-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-s390x-cross + TARGETS: s390x-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg.gitlab-ci.yml +0
-0.gitlab-ci.yml include: · line 17
Quoted 4 lines
.gitlab-ci.yml +1
-0@@ -14,6 +14,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml'KVM code is already covered by the "cross-s390x-system" job, but an additional compilation test with --disable-tcg makes sense here. I'd then rather name it "cross-s390x-no-tcg" or so instead of "cross-s390x-kvm".
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
And while you're at it, I'd maybe rather name the new file just crossbuilds-s390x.yml and also move the other s390x related jobs into it?
I don't think we really should split it up so much - just put these jobs in the existing crosbuilds.yml file.
Don't we want to leverage
MAINTAINERSfile?As mentioned in the cover letter, I think this is mis-using the
MAINTAINERSfile to try to represent something different.
Quoted 7 lines
The
MAINTAINERSfile says who is responsible for the contents of the .yml file, which is the CI maintainers, because we want a consistent gitlab configuration as a whole, not everyone doing their own thing.
MAINTAINERSdoesn't say who is responsible for making sure the actual jobs that run are passing, which is potentially a completely different person. If we want to track that, it is not theMAINTAINERSfile.
Thanks, I was expecting subsystem maintainers would worry about the CI jobs, but you made it clear this should be different persons who look after CI. I understand it is better to have no maintainer than to have incorrect maintainer.
Re: [PATCH 5/8] gitlab-ci: Add KVM s390x cross-build jobs
Quoted 56 lines · Philippe Mathieu-Daudé
Quoted 55 lines · Daniel P. Berrangé
Quoted 39 lines · Philippe Mathieu-Daudé
Quoted 38 lines · Daniel P. Berrangé
Quoted 37 lines · Thomas Huth
Quoted 27 lines · Philippe Mathieu-Daudé
Cross-build s390x target with only KVM accelerator enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 ++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml.gitlab-ci.d/crossbuilds-kvm-s390x.yml new file +6
-0@@ -0,0 +1,6 @@ +cross-s390x-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-s390x-cross + TARGETS: s390x-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg.gitlab-ci.yml +0
-0.gitlab-ci.yml include: · line 17
Quoted 4 lines
.gitlab-ci.yml +1
-0@@ -14,6 +14,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml'KVM code is already covered by the "cross-s390x-system" job, but an additional compilation test with --disable-tcg makes sense here. I'd then rather name it "cross-s390x-no-tcg" or so instead of "cross-s390x-kvm".
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
And while you're at it, I'd maybe rather name the new file just crossbuilds-s390x.yml and also move the other s390x related jobs into it?
I don't think we really should split it up so much - just put these jobs in the existing crosbuilds.yml file.
Don't we want to leverage
MAINTAINERSfile?As mentioned in the cover letter, I think this is mis-using the
MAINTAINERSfile to try to represent something different.The
MAINTAINERSfile says who is responsible for the contents of the .yml file, which is the CI maintainers, because we want a consistent gitlab configuration as a whole, not everyone doing their own thing.
Quoted 8 lines
Quoted 3 lines
MAINTAINERSdoesn't say who is responsible for making sure the actual jobs that run are passing, which is potentially a completely different person. If we want to track that, it is not theMAINTAINERSfile.Thanks, I was expecting subsystem maintainers would worry about the CI jobs, but you made it clear this should be different persons who look after CI. I understand it is better to have no maintainer than to have incorrect maintainer.
MAINTAINERS and scripts/get_maintainer.pl doesn't scale well with YAML / JSON... While this files are maintained by the Gitlab subsystem maintainers, how can we had job-specific reviewers?
PATCH 6/8 gitlab-ci: Add KVM PPC cross-build jobs
In reply to Philippe Mathieu-DaudéCross-build PPC target with KVM and TCG accelerators enabled.
---
later this job build KVM-only.
--- .gitlab-ci.d/crossbuilds-kvm-ppc.yml | 5 +++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 7 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-ppc.yml
.gitlab-ci.d/crossbuilds-kvm-ppc.yml new file +5 -0
@@ -0,0 +1,5 @@ +cross-ppc64el-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-ppc64el-cross + TARGETS: ppc64-softmmu
.gitlab-ci.yml +1 -0
@@ -15,6 +15,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-ppc.yml' .native_build_job_template: &native_build_job_definition stage: build
MAINTAINERS +1 -0
@@ -397,6 +397,7 @@ PPC KVM CPUs M: David Gibson <[email protected]> S: Maintained F: target/ppc/kvm.c +F: .gitlab-ci.d/crossbuilds-kvm-ppc.yml S390 KVM CPUs M: Halil Pasic <[email protected]>
Signature · 1 line
2.26.2
Re: [PATCH 6/8] gitlab-ci: Add KVM PPC cross-build jobs
Quoted 11 lines · Philippe Mathieu-Daudé
Cross-build PPC target with KVM and TCG accelerators enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
later this job build KVM-only.--- .gitlab-ci.d/crossbuilds-kvm-ppc.yml | 5 +++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 7 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-ppc.yml
Quoted 35 lines
.gitlab-ci.d/crossbuilds-kvm-ppc.yml new file +5
-0@@ -0,0 +1,5 @@ +cross-ppc64el-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-ppc64el-cross + TARGETS: ppc64-softmmu.gitlab-ci.yml +1
-0@@ -15,6 +15,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-ppc.yml' .native_build_job_template: &native_build_job_definition stage: buildMAINTAINERS +1
-0@@ -397,6 +397,7 @@ PPC KVM CPUs M: David Gibson <[email protected]> S: Maintained F: target/ppc/kvm.c +F: .gitlab-ci.d/crossbuilds-kvm-ppc.yml S390 KVM CPUs M: Halil Pasic <[email protected]>
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH 6/8] gitlab-ci: Add KVM PPC cross-build jobs
In reply to Philippe Mathieu-DaudéQuoted 18 lines · Philippe Mathieu-Daudé
Cross-build PPC target with KVM and TCG accelerators enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
later this job build KVM-only.--- .gitlab-ci.d/crossbuilds-kvm-ppc.yml | 5 +++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 7 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-ppc.yml.gitlab-ci.d/crossbuilds-kvm-ppc.yml new file +0
-0
.gitlab-ci.d/crossbuilds-kvm-ppc.yml line 5
Quoted 5 lines
.gitlab-ci.d/crossbuilds-kvm-ppc.yml new file +5
-0@@ -0,0 +1,5 @@ +cross-ppc64el-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-ppc64el-cross + TARGETS: ppc64-softmmu
Compilation of the ppc KVM code should already be covered by the cross-ppc64el-system job, see e.g.:
https://gitlab.com/qemu-project/qemu/-/jobs/883985074#L297
Thus there is no need to add a new job for this here. It might be a good idea to remove ppc64-softmmu from the exclude list in crossbuilds.yml, though, so that we also check the 64-bit builds and not only the 32-bit ones.
Thomas
PATCH 7/8 gitlab-ci: Add KVM MIPS cross-build jobs
In reply to Philippe Mathieu-DaudéCross-build mips target with KVM and TCG accelerators enabled.
---
later we'll build KVM-only.
--- .gitlab-ci.d/crossbuilds-kvm-mips.yml | 5 +++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 7 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-mips.yml
.gitlab-ci.d/crossbuilds-kvm-mips.yml new file +5 -0
@@ -0,0 +1,5 @@ +cross-mips64el-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-mips64el-cross + TARGETS: mips64el-softmmu
.gitlab-ci.yml +1 -0
@@ -16,6 +16,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-ppc.yml' + - local: '/.gitlab-ci.d/crossbuilds-kvm-mips.yml' .native_build_job_template: &native_build_job_definition stage: build
MAINTAINERS +1 -0
@@ -392,6 +392,7 @@ MIPS KVM CPUs M: Huacai Chen <[email protected]> S: Odd Fixes F: target/mips/kvm.c +F: .gitlab-ci.d/crossbuilds-kvm-mips.yml PPC KVM CPUs M: David Gibson <[email protected]>
Signature · 1 line
2.26.2
Re: [PATCH 7/8] gitlab-ci: Add KVM MIPS cross-build jobs
Quoted 18 lines · Philippe Mathieu-Daudé
Cross-build mips target with KVM and TCG accelerators enabled.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
later we'll build KVM-only.--- .gitlab-ci.d/crossbuilds-kvm-mips.yml | 5 +++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 7 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-mips.yml.gitlab-ci.d/crossbuilds-kvm-mips.yml new file +0
-0
.gitlab-ci.d/crossbuilds-kvm-mips.yml line 5
Quoted 5 lines
.gitlab-ci.d/crossbuilds-kvm-mips.yml new file +5
-0@@ -0,0 +1,5 @@ +cross-mips64el-kvm: + extends: .cross_accel_build_job + variables: + IMAGE: debian-mips64el-cross + TARGETS: mips64el-softmmu
That's already covered, see:
https://gitlab.com/qemu-project/qemu/-/jobs/883985068#L296
Thomas
PATCH 8/8 gitlab-ci: Add Xen cross-build jobs
In reply to Philippe Mathieu-DaudéCross-build ARM and X86 targets with only Xen accelerator enabled.
--- .gitlab-ci.d/crossbuilds-xen.yml | 14 ++++++++++++++ .gitlab-ci.yml | 1 + MAINTAINERS | 1 + 3 files changed, 16 insertions(+) create mode 100644 .gitlab-ci.d/crossbuilds-xen.yml
.gitlab-ci.d/crossbuilds-xen.yml new file +14 -0
@@ -0,0 +1,14 @@ +cross-amd64-xen: + extends: .cross_accel_build_job + variables: + IMAGE: debian-amd64-cross + ACCEL: xen + TARGETS: i386-softmmu,x86_64-softmmu + ACCEL_CONFIGURE_OPTS: --disable-tcg --disable-kvm + +cross-arm64-xen: + extends: .cross_accel_build_job + variables: + IMAGE: debian-arm64-cross + ACCEL: xen + TARGETS: aarch64-softmmu
.gitlab-ci.yml +1 -0
@@ -17,6 +17,7 @@ include: - local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-ppc.yml' - local: '/.gitlab-ci.d/crossbuilds-kvm-mips.yml' + - local: '/.gitlab-ci.d/crossbuilds-xen.yml' .native_build_job_template: &native_build_job_definition stage: build
MAINTAINERS +1 -0
@@ -488,6 +488,7 @@ F: include/hw/xen/ F: include/sysemu/xen.h F: include/sysemu/xen-mapcache.h F: stubs/xen-hw-stub.c +F: .gitlab-ci.d/crossbuilds-xen.yml Guest CPU Cores (HAXM) ---------------------
Signature · 1 line
2.26.2
Quoted 45 lines · Philippe Mathieu-Daudé
Hi,
I was custom to use Travis-CI for testing KVM builds on s390x/ppc with the Travis-CI jobs.
During October Travis-CI became unusable for me (extremely slow, see [1]). Then my free Travis account got updated to the new "10K credit minutes allotment" [2] which I burned without reading the notification email in time (I'd burn them eventually anyway).
Today Travis-CI is pointless to me. While I could pay to run my QEMU jobs, I don't think it is fair for an Open Source project to ask its forks to pay for a service.
As we want forks to run some CI before contributing patches, and we have cross-build Docker images available for Linux hosts, I added some cross KVM/Xen build jobs to Gitlab-CI.
Cross-building doesn't have the same coverage as native building, as we can not run the tests. But this is still useful to get link failures.
Each job is added in its own YAML file, so it is easier to notify subsystem maintainers in case of troubles.
Resulting pipeline:
https://gitlab.com/philmd/qemu/-/pipelines/225948077Regards,
Phil.
[1] https://travis-ci.community/t/build-delays-for-open-source-project/10272
[2] https://blog.travis-ci.com/2020-11-02-travis-ci-new-billingPhilippe Mathieu-Daudé (8):
gitlab-ci: Replace YAML anchors by extends (cross_system_build_job)
gitlab-ci: Introduce 'cross_accel_build_job' template
gitlab-ci: Add KVM X86 cross-build jobs
gitlab-ci: Add KVM ARM cross-build jobs
gitlab-ci: Add KVM s390x cross-build jobs
gitlab-ci: Add KVM PPC cross-build jobs
gitlab-ci: Add KVM MIPS cross-build jobs
gitlab-ci: Add Xen cross-build jobs
Quoted 6 lines
.gitlab-ci.d/crossbuilds-kvm-arm.yml | 5 +++ .gitlab-ci.d/crossbuilds-kvm-mips.yml | 5 +++ .gitlab-ci.d/crossbuilds-kvm-ppc.yml | 5 +++ .gitlab-ci.d/crossbuilds-kvm-s390x.yml | 6 +++ .gitlab-ci.d/crossbuilds-kvm-x86.yml | 6 +++ .gitlab-ci.d/crossbuilds-xen.yml | 14 +++++++
Adding so many different files here is crazy IMHO, and then should all be under the same GitLab CI maintainers, not the respective arch maintainers. The MAINTAINERS file is saying who is responsible for the contents of the .yml file, not who is responsible for making sure KVM works on that arch.
Quoted 10 lines
.gitlab-ci.d/crossbuilds.yml | 52 ++++++++++++++++---------- .gitlab-ci.yml | 6 +++ MAINTAINERS | 6 +++ 9 files changed, 85 insertions(+), 20 deletions(-) create mode 100644 .gitlab-ci.d/crossbuilds-kvm-arm.yml create mode 100644 .gitlab-ci.d/crossbuilds-kvm-mips.yml create mode 100644 .gitlab-ci.d/crossbuilds-kvm-ppc.yml create mode 100644 .gitlab-ci.d/crossbuilds-kvm-s390x.yml create mode 100644 .gitlab-ci.d/crossbuilds-kvm-x86.yml create mode 100644 .gitlab-ci.d/crossbuilds-xen.yml
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|