We're already building libvirt in the containers already, if we publish the build in form of, say, RPMs, later stages of the pipeline can consume the RPMs instead of re-building libvirt from scratch. Signed-off-by: Erik Skultety <eskultet@xxxxxxxxxx> --- .gitlab-ci.yml | 3 ++- ci/gitlab.yml | 16 ++++++++++++++++ ci/manifest.yml | 21 ++++++++++++++++++++- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24533a937a..d84ac31601 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,8 @@ include: '/ci/gitlab.yml' - meson dist -C build --no-tests - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip"; then - rpmbuild --nodeps -ta build/meson-dist/libvirt-*.tar.xz; + rpmbuild --clean --nodeps --define "_topdir $PWD/rpmbuild/" -ta build/meson-dist/libvirt-*.tar.xz; + mv rpmbuild/RPMS/x86_64/ libvirt-rpms/; else meson compile -C build; meson test -C build --no-suite syntax-check --print-errorlogs; diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 9825624938..61f8ce03ef 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -406,6 +406,10 @@ x86_64-centos-stream-8: allow_failure: false variables: NAME: centos-stream-8 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms x86_64-centos-stream-9: @@ -415,6 +419,10 @@ x86_64-centos-stream-9: allow_failure: false variables: NAME: centos-stream-9 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms x86_64-debian-10: @@ -460,6 +468,10 @@ x86_64-fedora-34: allow_failure: false variables: NAME: fedora-34 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms x86_64-fedora-35: @@ -469,6 +481,10 @@ x86_64-fedora-35: allow_failure: false variables: NAME: fedora-35 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms x86_64-fedora-rawhide: diff --git a/ci/manifest.yml b/ci/manifest.yml index 87d923ae78..1873efa0ff 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -21,10 +21,19 @@ targets: centos-stream-8: jobs: - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms centos-stream-9: jobs: - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + debian-10: jobs: - arch: x86_64 @@ -126,11 +135,21 @@ targets: - arch: s390x allow-failure: true - fedora-34: x86_64 + fedora-34: + jobs: + - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms fedora-35: jobs: - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms - arch: mingw32 allow-failure: true -- 2.34.1