aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-01-12 19:10:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-12 19:10:59 +0000
commit5630796fe55efac8d29bff38d472d84ef03d034a (patch)
tree17efac0cf65bc81926945951203f472fc5dc1249
parent3b54b935c9171891a86d3b7b3bf98eac776ad259 (diff)
parent5d32eda661c476d263ebb46f486168f9adf43c1f (diff)
Merge "Switch to absolute paths in Dockerfiles"
-rw-r--r--docker/restapi/Dockerfile4
-rw-r--r--docker/smoke/Dockerfile4
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
index b36525f95..15b83fe3f 100644
--- a/docker/restapi/Dockerfile
+++ b/docker/restapi/Dockerfile
@@ -28,7 +28,7 @@ RUN apk --no-cache add --update python3 sshpass \
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 https://github.com/openstack/refstack-client.git /src/refstack-client && \
- (cd src/refstack-client && git checkout $REFSTACK_TAG) && \
+ (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 -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
@@ -40,7 +40,7 @@ RUN apk --no-cache add --update python3 sshpass \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
doctor-tests && \
git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
- (cd src/odl_test && git checkout $ODL_TAG) && \
+ (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 5b634b506..5e5b1591e 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -22,7 +22,7 @@ RUN apk --no-cache add --virtual .build-deps --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/ && \
git clone https://github.com/openstack/refstack-client.git /src/refstack-client && \
- (cd src/refstack-client && git checkout $REFSTACK_TAG) && \
+ (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 -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
@@ -31,7 +31,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-e/src/refstack-client /src/rally -rthirdparty-requirements.txt && \
git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
- (cd src/odl_test && git checkout $ODL_TAG) && \
+ (cd /src/odl_test && git checkout $ODL_TAG) && \
ln -s /src/tempest /src/refstack-client/.tempest && \
virtualenv --system-site-packages /src/tempest/.venv && \
rm -r upper-constraints.txt thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \