[PATCH] ci: Install python RPMs from libvirt/libvirt-python CI artifacts

After addition of the new libvirt-client-qemu sub-package which is using python bindings (thus creating a circular dependency between the libvirt and libvirt-python projects) the integration jobs fail with: Error: Problem: conflicting requests - nothing provides python3-libvirt >= 8.9.0-1.el9 needed by libvirt-client-qemu-8.9.0-1.el9.x86_64 The libvirt-python project now provides the RPMs in artifacts: https://gitlab.com/libvirt/libvirt-python/-/merge_requests/96 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ci/integration-template.yml | 2 +- ci/integration.yml | 40 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 3347bb03ed..acb51a0b27 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -25,7 +25,7 @@ .install-deps: &install-deps - - sudo dnf install -y libvirt-rpms/* libvirt-perl-rpms/* + - sudo dnf install -y libvirt-rpms/* libvirt-perl-rpms/* libvirt-python-rpms/* - sudo pip3 install --prefix=/usr avocado-framework diff --git a/ci/integration.yml b/ci/integration.yml index 19d227faad..b79d2e0f40 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -20,6 +20,10 @@ centos-stream-8-tests-prebuilt-env: job: x86_64-centos-stream-8-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-centos-stream-8-prebuilt-env + ref: master + artifacts: true centos-stream-8-tests-local-env: extends: @@ -31,6 +35,10 @@ centos-stream-8-tests-local-env: job: x86_64-centos-stream-8-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-centos-stream-8-prebuilt-env + ref: master + artifacts: true .centos-stream-9-tests: @@ -52,6 +60,10 @@ centos-stream-9-tests-prebuilt-env: job: x86_64-centos-stream-9-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-centos-stream-9-prebuilt-env + ref: master + artifacts: true centos-stream-9-tests-local-env: extends: @@ -63,6 +75,10 @@ centos-stream-9-tests-local-env: job: x86_64-centos-stream-9-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-centos-stream-9-prebuilt-env + ref: master + artifacts: true .fedora-35-tests: @@ -84,6 +100,10 @@ fedora-35-tests-prebuilt-env: job: x86_64-fedora-35-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-35-prebuilt-env + ref: master + artifacts: true fedora-35-tests-local-env: extends: @@ -95,6 +115,10 @@ fedora-35-tests-local-env: job: x86_64-fedora-35-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-35-prebuilt-env + ref: master + artifacts: true .fedora-36-tests: @@ -116,6 +140,10 @@ fedora-36-tests-prebuilt-env: job: x86_64-fedora-36-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-36-prebuilt-env + ref: master + artifacts: true fedora-36-tests-local-env: extends: @@ -127,6 +155,10 @@ fedora-36-tests-local-env: job: x86_64-fedora-36-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-36-prebuilt-env + ref: master + artifacts: true .fedora-36-upstream-qemu-tests: @@ -148,6 +180,10 @@ fedora-36-upstream-qemu-tests-prebuilt-env: job: x86_64-fedora-36-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-36-prebuilt-env + ref: master + artifacts: true fedora-36-upstream-qemu-tests-local-env: extends: @@ -159,3 +195,7 @@ fedora-36-upstream-qemu-tests-local-env: job: x86_64-fedora-36-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-36-prebuilt-env + ref: master + artifacts: true -- 2.37.3