From 5b5cd3daccaa68bc6131facd79128f4e905ce34b Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 10 Oct 2022 10:44:17 +0200 Subject: ci: Expose built RPMs as artifacts Expose the artifacts from the centos-stream-8/9 and fedora 35/36 jobs so that the main libvirt integration testing project can consume them. The new libvirt sub-rpm containing a python helper to access QMP directly requires python environment which we didn't yet install in the integration job. Signed-off-by: Peter Krempa --- .gitlab-ci.yml | 12 ++++++++++-- ci/gitlab/builds.yml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14d8bc3..d97d5e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,11 @@ stages: - $PYTHON -m pip install . - $PYTHON setup.py test - $PYTHON setup.py sdist - - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild --nodeps -ta dist/libvirt-python*tar.gz ; fi + - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; + then + rpmbuild --clean --nodeps --define "_topdir $PWD/rpmbuild" -ta dist/libvirt-python*tar.gz ; + mv rpmbuild/RPMS/x86_64/ libvirt-python-rpms ; + fi .native_git_build_job_prebuilt_env: extends: @@ -49,7 +53,11 @@ stages: - $PYTHON -m pip install . - $PYTHON setup.py test - $PYTHON setup.py sdist - - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild --nodeps -ta dist/libvirt-python*tar.gz ; fi + - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; + then + rpmbuild --clean --nodeps --define "_topdir $PWD/rpmbuild" -ta dist/libvirt-python*tar.gz ; + mv rpmbuild/RPMS/x86_64/ libvirt-python-rpms ; + fi .native_build_job_prebuilt_env: extends: diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 0cd4533..669b082 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -15,6 +15,10 @@ x86_64-centos-stream-8-prebuilt-env: allow_failure: false variables: NAME: centos-stream-8 + artifacts: + expire_in: 1 hour + paths: + - libvirt-python-rpms x86_64-centos-stream-8-local-env: extends: .native_build_job_local_env @@ -23,6 +27,10 @@ x86_64-centos-stream-8-local-env: variables: IMAGE: quay.io/centos/centos:stream8 NAME: centos-stream-8 + artifacts: + expire_in: 1 hour + paths: + - libvirt-python-rpms x86_64-centos-stream-8-git-prebuilt-env: @@ -61,6 +69,10 @@ x86_64-centos-stream-9-prebuilt-env: allow_failure: false variables: NAME: centos-stream-9 + artifacts: + expire_in: 1 hour + paths: + - libvirt-python-rpms x86_64-centos-stream-9-local-env: extends: .native_build_job_local_env @@ -69,6 +81,10 @@ x86_64-centos-stream-9-local-env: variables: IMAGE: quay.io/centos/centos:stream9 NAME: centos-stream-9 + artifacts: + expire_in: 1 hour + paths: + - libvirt-python-rpms x86_64-debian-10-prebuilt-env: @@ -115,6 +131,10 @@ x86_64-fedora-35-prebuilt-env: allow_failure: false variables: NAME: fedora-35 + artifacts: + expire_in: 1 hour + paths: + - libvirt-python-rpms x86_64-fedora-35-local-env: extends: .native_build_job_local_env @@ -123,6 +143,10 @@ x86_64-fedora-35-local-env: variables: IMAGE: registry.fedoraproject.org/fedora:35 NAME: fedora-35 + artifacts: + expire_in: 1 hour + paths: + - libvirt-python-rpms x86_64-fedora-36-prebuilt-env: @@ -133,6 +157,10 @@ x86_64-fedora-36-prebuilt-env: allow_failure: false variables: NAME: fedora-36 + artifacts: + expire_in: 1 hour + paths: + - libvirt-python-rpms x86_64-fedora-36-local-env: extends: .native_build_job_local_env @@ -141,6 +169,10 @@ x86_64-fedora-36-local-env: variables: IMAGE: registry.fedoraproject.org/fedora:36 NAME: fedora-36 + artifacts: + expire_in: 1 hour + paths: + - libvirt-python-rpms x86_64-fedora-rawhide-prebuilt-env: -- cgit v1.2.1