| Message ID | 20201206185508.3545711-3-philmd@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | gitlab-ci: Add accelerator-specific Linux jobs | expand |
On 12/6/20 7:55 PM, Philippe Mathieu-Daudé wrote: > Introduce a job template to cross-build accelerator specific > jobs (enable a specific accelerator, disabling the others). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > .gitlab-ci.d/crossbuilds.yml | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml > index 099949aaef3..be63b209c5b 100644 > --- a/.gitlab-ci.d/crossbuilds.yml > +++ b/.gitlab-ci.d/crossbuilds.yml > @@ -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 > 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
On 12/6/20 8:23 PM, Claudio Fontana wrote: > On 12/6/20 7:55 PM, Philippe Mathieu-Daudé wrote: >> Introduce a job template to cross-build accelerator specific >> jobs (enable a specific accelerator, disabling the others). >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> .gitlab-ci.d/crossbuilds.yml | 12 ++++++++++++ >> 1 file changed, 12 insertions(+) >> >> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml >> index 099949aaef3..be63b209c5b 100644 >> --- a/.gitlab-ci.d/crossbuilds.yml >> +++ b/.gitlab-ci.d/crossbuilds.yml >> @@ -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 >> > > Hi Philippe, > > 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 > > 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 :) > > Thanks, > > Ciao, > > Claudio >
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 099949aaef3..be63b209c5b 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -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
Introduce a job template to cross-build accelerator specific jobs (enable a specific accelerator, disabling the others). Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- .gitlab-ci.d/crossbuilds.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+)