summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-10-13 14:29:14 +0200
committerJose Lausuch <jalausuch@suse.com>2017-10-13 13:25:41 +0000
commitc4b320f3e292c1348e467cd1438c996510d50af6 (patch)
tree3fcd6eaf7deb1798c483bffa0bc6e93d244ea28c /docker
parentfed72336e3b50b8441f233a2f122e482ee83ae8c (diff)
Get the right git commit ids
Co-Authored-By: Linda Wang <wangwulin@huawei.com> Change-Id: I08ad30156049ac0814fcebfc0f116176331c1dd3 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 7db506b8c184917d0986b14722bbbf95b7fce3d3)
Diffstat (limited to 'docker')
-rw-r--r--docker/restapi/Dockerfile8
-rw-r--r--docker/smoke/Dockerfile8
2 files changed, 8 insertions, 8 deletions
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
index 3021c839a..aba4b6ed7 100644
--- a/docker/restapi/Dockerfile
+++ b/docker/restapi/Dockerfile
@@ -15,8 +15,8 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \
python-dev python3-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev \
ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \
- 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 --no-cache-dir --src /src \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
@@ -26,8 +26,8 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \
-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 \
doctor-tests && \
- 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) && \
+ git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
+ (cd src/odl_test && git checkout $ODL_TAG) && \
git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \
ln -s /src/tempest /src/refstack-client/.tempest && \
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index b1443c792..cb3eaaee9 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -9,15 +9,15 @@ ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
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 && \
- (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 --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 && \
- 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) && \
+ git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
+ (cd src/odl_test && git checkout $ODL_TAG) && \
git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
ln -s /src/tempest /src/refstack-client/.tempest && \
virtualenv --system-site-packages /src/tempest/.venv && \