diff mbox series

[v16,99/99] gitlab: defend the new stripped down arm64 configs

Message ID 20210604155312.15902-100-alex.bennee@linaro.org
State New
Headers show
Series arm tcg/kvm refactor and split with kvm only support | expand

Commit Message

Alex Bennée June 4, 2021, 3:53 p.m. UTC 
We can now build a KVM only aarch64-softmmu image which we need to
cross build. We can also build a version that only supports a limited
set of 64 bit images.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 .gitlab-ci.d/buildtest.yml   | 10 ++++++++++
 .gitlab-ci.d/crossbuilds.yml |  9 +++++++++
 2 files changed, 19 insertions(+)

-- 
2.20.1

Comments

Richard Henderson June 5, 2021, 11:03 p.m. UTC | #1 
On 6/4/21 8:53 AM, Alex Bennée wrote:
> We can now build a KVM only aarch64-softmmu image which we need to

> cross build. We can also build a version that only supports a limited

> set of 64 bit images.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>   .gitlab-ci.d/buildtest.yml   | 10 ++++++++++

>   .gitlab-ci.d/crossbuilds.yml |  9 +++++++++

>   2 files changed, 19 insertions(+)

> 

> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml

> index b72c57e4df..a48e723efe 100644

> --- a/.gitlab-ci.d/buildtest.yml

> +++ b/.gitlab-ci.d/buildtest.yml

> @@ -645,6 +645,16 @@ build-without-default-features:

>           --target-list-exclude=arm-softmmu,i386-softmmu,mipsel-softmmu,mips64-softmmu,ppc-softmmu

>       MAKE_CHECK_ARGS: check-unit

>   

> +build-64bit-only-aarch64-softmmu:

> +  extends: .native_build_job_template

> +  needs:

> +    job: amd64-debian-container

> +  variables:

> +    IMAGE: debian-amd64

> +    TARGETS: aarch64-softmmu

> +    CONFIGURE_ARGS: --with-devices-aarch64=../configs/aarch64-softmmu/64bit-only.mak

> +    MAKE_CHECK_ARGS: check

> +

>   build-libvhost-user:

>     stage: build

>     image: $CI_REGISTRY_IMAGE/qemu/fedora:latest

> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml

> index 6b3865c9e8..a118aa3052 100644

> --- a/.gitlab-ci.d/crossbuilds.yml

> +++ b/.gitlab-ci.d/crossbuilds.yml

> @@ -36,6 +36,15 @@ cross-arm64-system:

>     variables:

>       IMAGE: debian-arm64-cross

>   

> +cross-arm64-kvm-only-system:

> +  extends: .cross_accel_build_job

> +  needs:

> +    job: arm64-debian-cross-container

> +  variables:

> +    IMAGE: debian-arm64-cross

> +    ACCEL: kvm

> +    EXTRA_CONFIGURE_OPTS: --disable-tcg

> +


Any reason not to merge these two?  And use virt-only, which as I mentioned is 
a useful kvm-only configuration.


r~
diff mbox series

Patch

diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index b72c57e4df..a48e723efe 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -645,6 +645,16 @@  build-without-default-features:
         --target-list-exclude=arm-softmmu,i386-softmmu,mipsel-softmmu,mips64-softmmu,ppc-softmmu
     MAKE_CHECK_ARGS: check-unit
 
+build-64bit-only-aarch64-softmmu:
+  extends: .native_build_job_template
+  needs:
+    job: amd64-debian-container
+  variables:
+    IMAGE: debian-amd64
+    TARGETS: aarch64-softmmu
+    CONFIGURE_ARGS: --with-devices-aarch64=../configs/aarch64-softmmu/64bit-only.mak
+    MAKE_CHECK_ARGS: check
+
 build-libvhost-user:
   stage: build
   image: $CI_REGISTRY_IMAGE/qemu/fedora:latest
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index 6b3865c9e8..a118aa3052 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -36,6 +36,15 @@  cross-arm64-system:
   variables:
     IMAGE: debian-arm64-cross
 
+cross-arm64-kvm-only-system:
+  extends: .cross_accel_build_job
+  needs:
+    job: arm64-debian-cross-container
+  variables:
+    IMAGE: debian-arm64-cross
+    ACCEL: kvm
+    EXTRA_CONFIGURE_OPTS: --disable-tcg
+
 cross-arm64-user:
   extends: .cross_user_build_job
   needs: