Message ID | 20230426180013.14814-14-farosas@suse.de |
---|---|
State | New |
Headers | show |
Series | None | expand |
On 4/26/23 19:00, Fabiano Rosas wrote: > From: Philippe Mathieu-Daudé<philmd@linaro.org> > > Add a manual new job to cross-build the aarch64 target with > only the KVM accelerator enabled (in particular, no TCG). > > Re-enable running the similar job on the project Aarch64 > custom runner. > > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org> > Signed-off-by: Fabiano Rosas<farosas@suse.de> > Reviewed-by: Thomas Huth<thuth@redhat.com> > --- > .gitlab-ci.d/crossbuilds.yml | 11 +++++++++++ > .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml | 4 ---- > 2 files changed, 11 insertions(+), 4 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 61b8ac86ee..da787ea9bf 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -196,3 +196,14 @@ cross-arm64-xen-only: IMAGE: debian-arm64-cross ACCEL: xen EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm + +# Similar job is run by qemu-project's custom runner by default +cross-arm64-kvm-only: + extends: .cross_accel_build_job + needs: + job: arm64-debian-cross-container + variables: + QEMU_JOB_OPTIONAL: 1 + IMAGE: debian-arm64-cross + ACCEL: kvm + EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-xen --without-default-devices diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml index 13e14a0f87..c61be46b82 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -115,11 +115,7 @@ ubuntu-22.04-aarch64-notcg: - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true script: - mkdir build - cd build