diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-12 10:59:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-12 10:59:32 +0000 |
| commit | 829cef1aee18d45cfdb3af07bd1e34362efdada8 (patch) | |
| tree | deb59e3484e5746fd8f399bd627998b153ecd2b5 | |
| parent | af76d3cb3d32d9b2a2fc83dedabce4374c3650ce (diff) | |
| parent | f57a51e43ca7a8903763cc24b1c510fa50a16b2c (diff) | |
| download | ceilometer-829cef1aee18d45cfdb3af07bd1e34362efdada8.tar.gz | |
Merge "Do not install libvirt-python on RHEL via pip"
| -rw-r--r-- | .zuul.yaml | 11 | ||||
| -rw-r--r-- | devstack/plugin.sh | 2 |
2 files changed, 12 insertions, 1 deletions
@@ -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: diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 6c696eca..9ffdaea8 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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 |