From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: Thomas Huth <thuth@redhat.com>, qemu-devel@nongnu.org Cc: "Halil Pasic" <pasic@linux.ibm.com>, "Christian Borntraeger" <borntraeger@de.ibm.com>, "Cornelia Huck" <cohuck@redhat.com>, "Claudio Fontana" <cfontana@suse.de>, "Willian Rampazzo" <wrampazz@redhat.com>, qemu-s390x@nongnu.org, "Anthony Perard" <anthony.perard@citrix.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Wainer dos Santos Moschetta" <wainersm@redhat.com>, xen-devel@lists.xenproject.org, "Paul Durrant" <paul@xen.org>, "Marcelo Tosatti" <mtosatti@redhat.com>, "Paolo Bonzini" <pbonzini@redhat.com>, kvm@vger.kernel.org, "Stefano Stabellini" <sstabellini@kernel.org> Subject: Re: [PATCH v2 3/5] gitlab-ci: Introduce 'cross_accel_build_job' template Date: Mon, 7 Dec 2020 13:53:48 +0100 [thread overview] Message-ID: <39d13e9c-1fb4-2fa9-6cf4-01086ad920aa@redhat.com> (raw) In-Reply-To: <93d186c0-feea-8e47-2a03-5276fb898bff@redhat.com> On 12/7/20 12:37 PM, Thomas Huth wrote: > On 07/12/2020 12.23, Philippe Mathieu-Daudé wrote: >> Introduce a job template to cross-build accelerator specific >> jobs (enable a specific accelerator, disabling the others). >> >> The specific accelerator is selected by the $ACCEL environment >> variable (default to KVM). >> >> Extra options such disabling other accelerators are passed >> via the $ACCEL_CONFIGURE_OPTS environment variable. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> .gitlab-ci.d/crossbuilds.yml | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) >> >> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml >> index 099949aaef3..d8685ade376 100644 >> --- a/.gitlab-ci.d/crossbuilds.yml >> +++ b/.gitlab-ci.d/crossbuilds.yml >> @@ -13,6 +13,23 @@ >> xtensa-softmmu" >> - make -j$(expr $(nproc) + 1) all check-build >> >> +# Job to cross-build specific accelerators. >> +# >> +# Set the $ACCEL variable to select the specific accelerator (default to >> +# KVM), and set extra options (such disabling other accelerators) via the >> +# $ACCEL_CONFIGURE_OPTS variable. >> +.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 > > I wonder whether we could also simply use the .cross_user_build_job - e.g. > by adding a $EXTRA_CONFIGURE_OPTS variable in the "../configure ..." line so > that the accel-jobs could use that for their --enable... and --disable... > settings? Well cross_user_build_job build tools (I'm not sure that desired). > Anyway, I've got no strong opinion on that one, and I'm also fine if we add > this new template, so: > > Reviewed-by: Thomas Huth <thuth@redhat.com> Thanks, we can improve on top.
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: Thomas Huth <thuth@redhat.com>, qemu-devel@nongnu.org Cc: "Marcelo Tosatti" <mtosatti@redhat.com>, kvm@vger.kernel.org, "Paul Durrant" <paul@xen.org>, "Cornelia Huck" <cohuck@redhat.com>, "Wainer dos Santos Moschetta" <wainersm@redhat.com>, "Halil Pasic" <pasic@linux.ibm.com>, "Christian Borntraeger" <borntraeger@de.ibm.com>, qemu-s390x@nongnu.org, "Stefano Stabellini" <sstabellini@kernel.org>, "Claudio Fontana" <cfontana@suse.de>, "Willian Rampazzo" <wrampazz@redhat.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Anthony Perard" <anthony.perard@citrix.com>, xen-devel@lists.xenproject.org, "Alex Bennée" <alex.bennee@linaro.org> Subject: Re: [PATCH v2 3/5] gitlab-ci: Introduce 'cross_accel_build_job' template Date: Mon, 7 Dec 2020 13:53:48 +0100 [thread overview] Message-ID: <39d13e9c-1fb4-2fa9-6cf4-01086ad920aa@redhat.com> (raw) In-Reply-To: <93d186c0-feea-8e47-2a03-5276fb898bff@redhat.com> On 12/7/20 12:37 PM, Thomas Huth wrote: > On 07/12/2020 12.23, Philippe Mathieu-Daudé wrote: >> Introduce a job template to cross-build accelerator specific >> jobs (enable a specific accelerator, disabling the others). >> >> The specific accelerator is selected by the $ACCEL environment >> variable (default to KVM). >> >> Extra options such disabling other accelerators are passed >> via the $ACCEL_CONFIGURE_OPTS environment variable. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> .gitlab-ci.d/crossbuilds.yml | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) >> >> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml >> index 099949aaef3..d8685ade376 100644 >> --- a/.gitlab-ci.d/crossbuilds.yml >> +++ b/.gitlab-ci.d/crossbuilds.yml >> @@ -13,6 +13,23 @@ >> xtensa-softmmu" >> - make -j$(expr $(nproc) + 1) all check-build >> >> +# Job to cross-build specific accelerators. >> +# >> +# Set the $ACCEL variable to select the specific accelerator (default to >> +# KVM), and set extra options (such disabling other accelerators) via the >> +# $ACCEL_CONFIGURE_OPTS variable. >> +.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 > > I wonder whether we could also simply use the .cross_user_build_job - e.g. > by adding a $EXTRA_CONFIGURE_OPTS variable in the "../configure ..." line so > that the accel-jobs could use that for their --enable... and --disable... > settings? Well cross_user_build_job build tools (I'm not sure that desired). > Anyway, I've got no strong opinion on that one, and I'm also fine if we add > this new template, so: > > Reviewed-by: Thomas Huth <thuth@redhat.com> Thanks, we can improve on top.
next prev parent reply other threads:[~2020-12-07 12:55 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-07 11:23 [PATCH v2 0/5] gitlab-ci: Add accelerator-specific Linux jobs Philippe Mathieu-Daudé 2020-12-07 11:23 ` Philippe Mathieu-Daudé 2020-12-07 11:23 ` [PATCH v2 1/5] gitlab-ci: Document 'build-tcg-disabled' is a KVM X86 job Philippe Mathieu-Daudé 2020-12-07 11:23 ` Philippe Mathieu-Daudé 2020-12-07 11:32 ` Thomas Huth 2020-12-07 11:32 ` Thomas Huth 2020-12-07 11:23 ` [PATCH v2 2/5] gitlab-ci: Replace YAML anchors by extends (cross_system_build_job) Philippe Mathieu-Daudé 2020-12-07 11:23 ` Philippe Mathieu-Daudé 2020-12-07 11:23 ` [PATCH v2 3/5] gitlab-ci: Introduce 'cross_accel_build_job' template Philippe Mathieu-Daudé 2020-12-07 11:23 ` Philippe Mathieu-Daudé 2020-12-07 11:37 ` Thomas Huth 2020-12-07 11:37 ` Thomas Huth 2020-12-07 12:53 ` Philippe Mathieu-Daudé [this message] 2020-12-07 12:53 ` Philippe Mathieu-Daudé 2020-12-07 11:23 ` [PATCH v2 4/5] gitlab-ci: Add KVM s390x cross-build jobs Philippe Mathieu-Daudé 2020-12-07 11:23 ` Philippe Mathieu-Daudé 2020-12-07 11:40 ` Thomas Huth 2020-12-07 11:40 ` Thomas Huth 2020-12-07 11:23 ` [PATCH v2 5/5] gitlab-ci: Add Xen " Philippe Mathieu-Daudé 2020-12-07 11:23 ` Philippe Mathieu-Daudé 2020-12-07 11:51 ` Thomas Huth 2020-12-07 11:51 ` Thomas Huth 2020-12-07 12:46 ` Philippe Mathieu-Daudé 2020-12-07 12:46 ` Philippe Mathieu-Daudé
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=39d13e9c-1fb4-2fa9-6cf4-01086ad920aa@redhat.com \ --to=philmd@redhat.com \ --cc=alex.bennee@linaro.org \ --cc=anthony.perard@citrix.com \ --cc=borntraeger@de.ibm.com \ --cc=cfontana@suse.de \ --cc=cohuck@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=mtosatti@redhat.com \ --cc=pasic@linux.ibm.com \ --cc=paul@xen.org \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-s390x@nongnu.org \ --cc=sstabellini@kernel.org \ --cc=thuth@redhat.com \ --cc=wainersm@redhat.com \ --cc=wrampazz@redhat.com \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.