aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-09-07 06:19:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-07 06:19:55 +0000
commitec749b2b2601cf31dadc4026d64299a1c705ec8d (patch)
tree127f464a5eed4f6661bccc98d718f6563b503ffd /docker
parentc6125c1fae2806908b070802233fb1d98d34a97a (diff)
parent66104a29635e55e6ff45836428c81d8d71f587d3 (diff)
Merge "Fix all refstack-client requirements on-the-fly"
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile7
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/smoke/Dockerfile6
3 files changed, 12 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 654643d83..29439f8e5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -80,9 +80,12 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-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/ && \
+ update-requirements -s --source /src/openstack-requirements /src/rally && \
+ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \
+ update-requirements -s --source /src/openstack-requirements /src/refstack-client && \
pip install --src /src -cupper-constraints.txt \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally/ && \
+ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+ /src/rally -e/src/refstack-client && \
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 \
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 172dbb9fa..c5766da30 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -19,7 +19,7 @@ RUN apk --no-cache add --update \
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/ && \
+ -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 && \
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 103854703..3b9007218 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -8,6 +8,12 @@ COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev git && \
+ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \
+ update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \
+ pip install --no-cache-dir --src /src \
+ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+ -e/src/refstack-client && \
pip install --no-cache-dir --src /src \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \