ci: manifest: Publish RPMs as artifacts on CentOS Stream and Fedoras

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@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24533a937afc54d4ef5619b55f8bcc589bf96743..d84ac3160142ef20043bc4ce6c1162c8de133e67 100644 (file)
--- 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 90eae497863cefc04ca50b84c56520fe973cbde1..a2f6e6b92d7479b975b5d44c9519ca9199d9ce83 100644 (file)
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -438,6 +438,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:
@@ -447,6 +451,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:
@@ -492,6 +500,10 @@ x86_64-fedora-34:
   allow_failure: false
   variables:
     NAME: fedora-34
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - libvirt-rpms
 
 
 x86_64-fedora-35:
@@ -501,6 +513,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 d511e5a4f564b6cd8d7fecca348856634c099cbb..7b5e78ffa76e00065abb604a76e004290972f724 100644 (file)
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -30,10 +30,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
@@ -135,11 +144,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