diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-02 14:24:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-02 14:24:46 +0000 |
| commit | 126c766ca0c311fec749ad28edcb4104835bdf5c (patch) | |
| tree | 6e91619a68cda6f2e6104ca5ef0f4d555e0ae44d /docker | |
| parent | cac7be2f3bf5fddd48aa35e83a855681ae93aafb (diff) | |
| parent | 9bde62345bc9cf94a55c3a3c78133643615d8e68 (diff) | |
| download | kolla-126c766ca0c311fec749ad28edcb4104835bdf5c.tar.gz kolla-126c766ca0c311fec749ad28edcb4104835bdf5c.zip | |
Merge "Remove the tempest version constrains in tempest container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index b259a1054..0d7eee942 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -18,7 +18,10 @@ RUN apt-get install -y --no-install-recommends \ {% elif install_type == 'source' %} ADD tempest-archive /tempest-source +# 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 \ && mkdir -p /etc/tempest /var/log/tempest /etc/tempest/tempest_lock |