diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-10-20 05:21:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-20 05:21:32 +0000 |
| commit | 79356722e6a015e2486c1bd59c6729ebd37aaa87 (patch) | |
| tree | 65b9ccf683d600658a82b59c9fba8f28260b10cb | |
| parent | edbc21af0b4879ccba376b07ae4909cf5bc12853 (diff) | |
| parent | 6b2680ff192c80a52f80f9cdc52c3328a16c2bac (diff) | |
Merge "Get the right git commit ids for ubuntu image" into stable/euphrates
| -rw-r--r-- | docker/Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 4b2a505fe..477dce52e 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 |