diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-09-14 15:15:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-14 15:15:22 +0000 |
| commit | 2eeea59953d477b1bb9cc3167426f547af2ba9f8 (patch) | |
| tree | ca10e408647b082a0c6ec7f04260560eefdfda69 | |
| parent | c34e1ef3c7f5cb047fcbdb8f7f3d6ed2b832aa0c (diff) | |
| parent | 1e4b2fc98ca484f074ae9cedd6274ad554f15444 (diff) | |
Merge "Select $OPENSTACK_TAG instead of stable/ocata"
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 6e5161c34..218d74417 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -79,7 +79,7 @@ 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 \ - -e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \ + -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#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 && \ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \ diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index c5766da30..04e32598e 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -15,7 +15,7 @@ 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 \ - -e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \ + -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#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 \ |