summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-10-20 03:46:17 +0000
committerLinda Wang <wangwulin@huawei.com>2017-10-20 03:47:40 +0000
commitae660ffa3285307edd41898cb2eaba22864d4f2d (patch)
treef96da8e8789bf36dea0f52fdd35294b7e210afa6
parent77061595499b08f328adafa3a45fcb998dc33722 (diff)
Get the right git commit ids for ubuntu image
Complement https://gerrit.opnfv.org/gerrit/#/c/45017 Change-Id: If52dee7c16dcc8606e72ebc198bc36e713792418 Signed-off-by: Linda Wang <wangwulin@huawei.com>
-rw-r--r--docker/Dockerfile8
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c946b7c3f..a6de3db4e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -86,8 +86,8 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
-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 && \
- (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \
+ git clone https://github.com/openstack/refstack-client.git /src/refstack-client && \
+ (cd src/refstack-client && git checkout $REFSTACK_TAG) && \
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 \
@@ -109,8 +109,8 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds
# other repositories
-RUN git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
- (cd src/odl_test && git checkout -b $ODL_TAG)
+RUN git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
+ (cd src/odl_test && git checkout $ODL_TAG)
RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test
# Install tempest venv and create symlink for running refstack-client