diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-07-05 23:47:18 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-07-06 07:47:19 +0200 |
| commit | 1bcc91c7ba00738dbc7d25422bc957d4cbf3f3ba (patch) | |
| tree | ca8d5a191f8a94872d178fc544e244a3984fd725 | |
| parent | 9916cd3fbd116762a84ca3a81dd08315d0b747cd (diff) | |
Move rally and tempest to requirements.txt
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 <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 3 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 |
4 files changed, 6 insertions, 4 deletions
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 \ diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 98bcce96..48702331 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -74,7 +74,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 \ diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index 82fe4efd..0fc58b10 100644 --- a/docker/thirdparty-requirements.txt +++ b/docker/thirdparty-requirements.txt @@ -5,6 +5,4 @@ git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc tosca-parser>=0.7.0 # Apache-2.0 heat-translator>=0.4.0 # Apache-2.0 -rally --e git+https://github.com/openstack/tempest@14.0.0#egg=tempest # Apache-2.0 git+https://github.com/openstack/refstack-client#egg=refstack-client diff --git a/requirements.txt b/requirements.txt index a7a1ac17..66a73871 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,3 +28,5 @@ six>=1.9.0 # MIT kingbird opnfv snaps +rally +tempest>=12.1.0 # Apache-2.0 |