Remove openstack-requirements from requirements.txt

Change-Id: Iaaee0c3e1c5377a5064660ad8396cfd8a7c5e250
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 66bd31a..774c00a 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -77,12 +77,15 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
         > upper-constraints.txt && \
     pip install --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
-        -rthirdparty-requirements.txt && \
+        -e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \
     git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
     update-requirements -s --source /src/openstack-requirements /src/rally/ && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+    pip install --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally/ && \
+    pip install --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
+        -rthirdparty-requirements.txt && \
     mkdir -p /etc/rally && \
     printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
     mkdir -p /var/lib/rally/database && rally-manage db create && \

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 6611709..172dbb9 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -15,11 +15,14 @@ RUN apk --no-cache add --update \
         > upper-constraints.txt && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest && \
+        -e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \
     git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
     update-requirements -s --source /src/openstack-requirements /src/rally/ && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally/ && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest && \
     rm -r upper-constraints.txt /src/rally/.git && \
     mkdir -p /etc/rally && \
     printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \

diff --git a/requirements.txt b/requirements.txt
index cfbe6a4..da1b5ad 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,7 +29,7 @@ six>=1.9.0 # MIT
 opnfv
 snaps
 tempest>=12.1.0 # Apache-2.0
-openstack-requirements
+rally
 SQLAlchemy<1.1.0,>=1.0.10 # MIT
 paramiko>=2.0 # LGPLv2.1+
 Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 98d7c55..e80ffff 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -14,4 +14,3 @@ robotframework-httplibrary===0.4.2
 robotframework-requests===0.4.7
 robotframework-sshlibrary===2.1.3;python_version=='2.7'
 IPy===0.83
--e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack-requirements