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>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2e37796..5c055ff 100644 (file)
--- 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 98bcce9..4870233 100644 (file)
--- 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 82fe4ef..0fc58b1 100644 (file)
--- 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 a7a1ac1..66a7387 100644 (file)
--- 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