From bc1abb3d7b217e46eb147bcc38f766c130bdd4cc Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 12 Oct 2020 13:43:03 +0200 Subject: [PATCH] rally: Add rally-openstack Currently source builds and centos-binary builds do not install rally-openstack. It results in errors with finding openstack plugin. Change-Id: I26ad81a7076bad7a659e2d80a1ad0453c13794d1 Closes-Bug: #1803968 --- docker/rally/Dockerfile.j2 | 1 + kolla/common/config.py | 4 ++++ tools/version-check.py | 1 + 3 files changed, 6 insertions(+) diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index 26ea51f36c..cdf1da0f00 100644 --- a/docker/rally/Dockerfile.j2 +++ b/docker/rally/Dockerfile.j2 @@ -14,6 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set rally_packages = [ 'openstack-rally', + 'openstack-rally-plugins', 'python3-os-testr' ] %} {% elif base_package_type == 'deb' %} diff --git a/kolla/common/config.py b/kolla/common/config.py index 243bf1b002..8aa17172f8 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -720,6 +720,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/rally/' 'rally-master.tar.gz')}, + 'rally-openstack': { + 'type': 'url', + 'location': ('$tarballs_base/openstack/rally-openstack/' + 'rally-openstack-2.0.0.tar.gz')}, 'sahara-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/sahara/' diff --git a/tools/version-check.py b/tools/version-check.py index d8b654dee3..3bce2cb4ab 100755 --- a/tools/version-check.py +++ b/tools/version-check.py @@ -67,6 +67,7 @@ ALWAYS_USE_VERSION_PROJECTS = { 'murano-tempest-plugin', 'neutron-tempest-plugin', 'python-tempestconf', + 'rally-openstack', 'telemetry_tempest_plugin', 'patrole', 'trove_tempest_plugin',