Do not install libvirt-python on RHEL via pip

since that is already in place.

Closes-Bug: #1896327
Depends-on: https://review.opendev.org/c/openstack/telemetry-tempest-plugin/+/801038

Change-Id: Ic158561b3f4d8ddcc092f4e8da1b3215f976fc98
This commit is contained in:
Matthias Runge 2021-08-11 09:10:24 +02:00
parent 14922b71d2
commit f57a51e43c
2 changed files with 12 additions and 1 deletions

View File

@ -25,6 +25,13 @@
- ^releasenotes/.*$
- ^ceilometer/tests/.*$
- job:
name: telemetry-dsvm-integration-centos-8s
nodeset: devstack-single-node-centos-8-stream
parent: telemetry-dsvm-integration
description: |
Functional testing for a Centos 8 stream system
- project:
templates:
- openstack-cover-jobs
@ -36,6 +43,8 @@
check:
jobs:
- grenade-ceilometer
- telemetry-dsvm-integration-centos-8s:
irrelevant-files: *ceilometer-irrelevant-files
- telemetry-dsvm-integration:
irrelevant-files: *ceilometer-irrelevant-files
- telemetry-dsvm-integration-ipv6-only:
@ -44,6 +53,8 @@
queue: telemetry
jobs:
- grenade-ceilometer
- telemetry-dsvm-integration-centos-8s:
irrelevant-files: *ceilometer-irrelevant-files
- telemetry-dsvm-integration:
irrelevant-files: *ceilometer-irrelevant-files
- telemetry-dsvm-integration-ipv6-only:

View File

@ -97,7 +97,7 @@ function _ceilometer_prepare_coordination {
function _ceilometer_prepare_virt_drivers {
# Only install virt drivers if we're running nova compute
if is_service_enabled n-cpu ; then
if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
if [[ "$VIRT_DRIVER" = 'libvirt' && "$DISTRO" != 'rhel8' ]]; then
pip_install_gr libvirt-python
fi