diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-14 16:58:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-14 16:58:49 +0000 |
| commit | c26086b1bea35784a10d9b9682b7301175d27603 (patch) | |
| tree | 11f2c4d6d5284b2f24891adeb56a9ff5e3e1dcc7 | |
| parent | d34e8a8826cf21c045501e6c57cee77f5c22b845 (diff) | |
| parent | bc1abb3d7b217e46eb147bcc38f766c130bdd4cc (diff) | |
| download | kolla-c26086b1bea35784a10d9b9682b7301175d27603.tar.gz kolla-c26086b1bea35784a10d9b9682b7301175d27603.zip | |
Merge "rally: Add rally-openstack"
| -rw-r--r-- | docker/rally/Dockerfile.j2 | 1 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | tools/version-check.py | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index 26ea51f36..cdf1da0f0 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 243bf1b00..8aa17172f 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 d8b654dee..3bce2cb4a 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', |