From ea262264c6592bf6296eed99a475bb36de2f3fa0 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Thu, 25 Jan 2018 14:25:41 +0530 Subject: Bundle tempest plugins in tempest container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * It includes barbican, blazar, cinder, congress, heat, ironic, keystone, mistral, magnum, murano, monasca, manila, neutron, patrole, telemetry, trove, vitrage, watcher, tripleo-common, sahara, and zaqar tempest plugins. * By using service_available config an user enable or disable a tempest plugin as well as run the tempest plugin tests. Co-Authored-By: Martin André Change-Id: I95a4be6cf1d56bd6f6a7c3cfa057ff8db1ca03fb --- docker/tempest/Dockerfile.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index 85bd268b8..18d753a31 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -7,10 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set tempest_packages = ['openstack-tempest'] %} + {% set tempest_packages = ['openstack-tempest-all'] %} {{ macros.install_packages(tempest_packages | customizable("packages")) }} -RUN ln -sf /usr/share/openstack-tempest-* /tempest +RUN ln -sf /usr/share/openstack-tempest /tempest {% elif base_distro in ['debian', 'ubuntu'] %} {% set tempest_packages = ['tempest'] %} @@ -29,7 +29,7 @@ ADD plugins-archive / '/tempest' ] %} -{% set tempest_base_plugins_pip_packages = [ +{% set tempest_plugins_pip_packages = [ '/plugins/*' ] %} @@ -39,7 +39,7 @@ RUN ln -s tempest-source/* tempest \ && sed -i 's/^tempest===.*$//' requirements/upper-constraints.txt \ && {{ macros.install_pip(tempest_pip_packages | customizable("pip_packages")) }} \ && if [ "$(ls /plugins)" ]; then \ - {{ macros.install_pip(tempest_base_plugins_pip_packages) }}; \ + {{ macros.install_pip(tempest_plugins_pip_packages) }}; \ fi \ && mkdir -p /etc/tempest /var/log/tempest /etc/tempest/tempest_lock -- cgit v1.2.3