| Message ID | 20201207112353.3814480-6-philmd@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | gitlab-ci: Add accelerator-specific Linux jobs | expand |
On 07/12/2020 12.23, Philippe Mathieu-Daudé wrote: > Cross-build ARM and X86 targets with only Xen accelerator enabled. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > .gitlab-ci.d/crossbuilds.yml | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml > index 7a94a66b4b3..31f10f1e145 100644 > --- a/.gitlab-ci.d/crossbuilds.yml > +++ b/.gitlab-ci.d/crossbuilds.yml > @@ -135,3 +135,18 @@ cross-win64-system: > extends: .cross_system_build_job > variables: > IMAGE: fedora-win64-cross > + > +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 Could you please simply replace aarch64-softmmu by arm-softmmu in the target-list-exclude statement in this file instead of adding a new job for arm64? That should have the same results and will spare us one job... Thanks, Thomas
On 12/7/20 12:51 PM, Thomas Huth wrote: > On 07/12/2020 12.23, Philippe Mathieu-Daudé wrote: >> Cross-build ARM and X86 targets with only Xen accelerator enabled. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> .gitlab-ci.d/crossbuilds.yml | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml >> index 7a94a66b4b3..31f10f1e145 100644 >> --- a/.gitlab-ci.d/crossbuilds.yml >> +++ b/.gitlab-ci.d/crossbuilds.yml >> @@ -135,3 +135,18 @@ cross-win64-system: >> extends: .cross_system_build_job >> variables: >> IMAGE: fedora-win64-cross >> + >> +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 > Could you please simply replace aarch64-softmmu by arm-softmmu in the > target-list-exclude statement in this file instead of adding a new job for > arm64? That should have the same results and will spare us one job... Ah, I now see my mistake, this is not the job I wanted to add, I probably messed during rebase. I'll respin with the proper xen-only config. > > Thanks, > Thomas >
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 7a94a66b4b3..31f10f1e145 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -135,3 +135,18 @@ cross-win64-system: extends: .cross_system_build_job variables: IMAGE: fedora-win64-cross + +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
Cross-build ARM and X86 targets with only Xen accelerator enabled. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- .gitlab-ci.d/crossbuilds.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+)