Re: [libvirt PATCH 3/3] ci: Start building RPMs
On Fri, 2020-10-09 at 07:11 -0400, Neal Gompa wrote: > On Fri, Oct 9, 2020 at 4:49 AM Andrea Bolognani wrote: > > On Thu, 2020-10-08 at 22:17 -0400, Neal Gompa wrote: > > > I've got a patch set locally that adds the few knobs needed to make > > > openSUSE build with the upstream spec file. If you want, I can clean > > > that up and submit it for upstream inclusion? > > > > Sure thing! > > I'll do it after your spec cleanup patch set lands, because otherwise > it's going to be a bit hellish to rebase. I agree, that's definitely the smart way to go about it :) -- Andrea Bolognani / Red Hat / Virtualization
Re: [libvirt PATCH 3/3] ci: Start building RPMs
On Fri, Oct 9, 2020 at 4:49 AM Andrea Bolognani wrote: > > On Thu, 2020-10-08 at 22:17 -0400, Neal Gompa wrote: > > On Thu, Oct 8, 2020 at 1:43 PM Andrea Bolognani wrote: > > > We lost this coverage during the move from CentOS CI to GitLab CI, > > > and it's high time we brought it back. > > > > > > Building RPMs is currently skipped for: > > > > > > * openSUSE, which is not supported by our spec file; > > > > I've got a patch set locally that adds the few knobs needed to make > > openSUSE build with the upstream spec file. If you want, I can clean > > that up and submit it for upstream inclusion? > > Sure thing! > I'll do it after your spec cleanup patch set lands, because otherwise it's going to be a bit hellish to rebase. -- 真実はいつも一つ！/ Always, there's only one truth!
Re: [libvirt PATCH 3/3] ci: Start building RPMs
On Thu, 2020-10-08 at 22:17 -0400, Neal Gompa wrote: > On Thu, Oct 8, 2020 at 1:43 PM Andrea Bolognani wrote: > > We lost this coverage during the move from CentOS CI to GitLab CI, > > and it's high time we brought it back. > > > > Building RPMs is currently skipped for: > > > > * openSUSE, which is not supported by our spec file; > > I've got a patch set locally that adds the few knobs needed to make > openSUSE build with the upstream spec file. If you want, I can clean > that up and submit it for upstream inclusion? Sure thing! -- Andrea Bolognani / Red Hat / Virtualization
Re: [libvirt PATCH 3/3] ci: Start building RPMs
On Thu, Oct 8, 2020 at 1:43 PM Andrea Bolognani wrote: > > We lost this coverage during the move from CentOS CI to GitLab CI, > and it's high time we brought it back. > > Building RPMs is currently skipped for: > > * openSUSE, which is not supported by our spec file; > I've got a patch set locally that adds the few knobs needed to make openSUSE build with the upstream spec file. If you want, I can clean that up and submit it for upstream inclusion? -- 真実はいつも一つ！/ Always, there's only one truth!
[libvirt PATCH 3/3] ci: Start building RPMs
We lost this coverage during the move from CentOS CI to GitLab CI, and it's high time we brought it back. Building RPMs is currently skipped for: * openSUSE, which is not supported by our spec file; * clang builds, where rpmbuild fails with meson.build:1:0: ERROR: Unable to determine dynamic linker * targets where we install Meson from PyPi, because that doesn't bring in the necessary RPM macros. Signed-off-by: Andrea Bolognani --- .gitlab-ci.yml | 11 +++ 1 file changed, 11 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dda199761a..887bc30242 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,6 +58,10 @@ stages: ninja -C build; ninja -C build test; fi +- if test -x /usr/bin/rpmbuild && test "$RPM" != "skip"; + then +rpmbuild --nodeps -ta build/meson-dist/libvirt-*.tar.xz; + fi # Jobs that we delegate to Cirrus CI because they require an operating # system other than Linux. These jobs will only run if the required @@ -302,6 +306,7 @@ x64-centos-7: # meson dist fails on CentOS 7 because of old git that fails to clone # from shallow git repository which is done when running meson dist DIST: skip +RPM: skip x64-centos-8: <<: *native_build_job_definition @@ -309,6 +314,7 @@ x64-centos-8: - x64-centos-8-container variables: NAME: centos-8 +RPM: skip x64-centos-8-clang: <<: *native_build_job_definition @@ -317,6 +323,7 @@ x64-centos-8-clang: variables: NAME: centos-8 CC: clang +RPM: skip x64-centos-stream: <<: *native_build_job_definition @@ -324,6 +331,7 @@ x64-centos-stream: - x64-centos-stream-container variables: NAME: centos-stream +RPM: skip x64-fedora-31: <<: *native_build_job_definition @@ -331,6 +339,7 @@ x64-fedora-31: - x64-fedora-31-container variables: NAME: fedora-31 +RPM: skip x64-fedora-32: <<: *native_build_job_definition @@ -353,6 +362,7 @@ x64-fedora-rawhide-clang: variables: NAME: fedora-rawhide CC: clang +RPM: skip x64-opensuse-151: <<: *native_build_job_definition @@ -360,6 +370,7 @@ x64-opensuse-151: - x64-opensuse-151-container variables: NAME: opensuse-151 +RPM: skip x64-ubuntu-1804: <<: *native_build_job_definition -- 2.26.2
