From 961224c6cf5ac24fc49fc52ab3c51a87348ee35d Mon Sep 17 00:00:00 2001 From: Chao Guo Date: Tue, 17 Jan 2017 16:49:13 +0800 Subject: Use install-pip macro in most source images 1. Enable customization of pip packages in source branch of most images 2. All pip packages install uniformly through install-pip macro, user can easily customize his own pip command (For example using a mirror) Co-Authored-By: Mauricio Lima Change-Id: If09582039f690fa4136e8f33200d5da15e092da7 --- docker/tempest/Dockerfile.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docker/tempest') diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index 2f3a53817..e713d1610 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -23,11 +23,16 @@ RUN ln -sf /var/lib/tempest /tempest {% elif install_type == 'source' %} ADD tempest-archive /tempest-source + +{% set tempest_pip_packages = [ + '/tempest' +] %} + # NOTE(Jeffrey4l): remove the tempest version constraint in the # upper-constrains.txt file. Otherwise, it will be failed. RUN ln -s tempest-source/* tempest \ && sed -i 's/^tempest===.*$//' requirements/upper-constraints.txt \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /tempest \ + && {{ macros.install_pip(tempest_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/tempest /var/log/tempest /etc/tempest/tempest_lock {% endif %} -- cgit v1.2.3