From 1bcc91c7ba00738dbc7d25422bc957d4cbf3f3ba Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 5 Jul 2017 23:47:18 +0200 Subject: Move rally and tempest to requirements.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As rally and tempest are called when preparing env, they are considered as dependencies. It also modifies on-the-fly upper-contraints.txt to allow cloning the git repository. Change-Id: I72e809d4cf15f9f2539a74fce1c6eb444d8c3b47 Signed-off-by: Cédric Ollivier --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 2e377966..5c055ff3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -75,7 +75,8 @@ RUN git config --global http.sslVerify false COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \ - sed /^tempest===.*$/d > upper-constraints.txt && \ + sed s/^tempest===.*$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@14.0.0#egg=tempest/ \ + > upper-constraints.txt && \ pip install --src /src -cupper-constraints.txt \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \ -- cgit 1.2.3-korg