diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-09-07 06:19:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-07 06:19:55 +0000 |
| commit | ec749b2b2601cf31dadc4026d64299a1c705ec8d (patch) | |
| tree | 127f464a5eed4f6661bccc98d718f6563b503ffd | |
| parent | c6125c1fae2806908b070802233fb1d98d34a97a (diff) | |
| parent | 66104a29635e55e6ff45836428c81d8d71f587d3 (diff) | |
Merge "Fix all refstack-client requirements on-the-fly"
| -rw-r--r-- | docker/Dockerfile | 7 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 6 | ||||
| -rw-r--r-- | upper-constraints.txt | 1 |
4 files changed, 12 insertions, 4 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 \ diff --git a/upper-constraints.txt b/upper-constraints.txt index 435802ac2..62a460a1d 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -6,7 +6,6 @@ git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc -e git+https://gerrit.opnfv.org/gerrit/promise#egg=promise -e git+https://gerrit.opnfv.org/gerrit/doctor#egg=doctor-test --e git+https://github.com/openstack/refstack-client#egg=refstack-client git+https://gerrit.opnfv.org/gerrit/domino#egg=domino cloudify-rest-client===4.0 iniparse===0.4 |