summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-01-12 07:29:05 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-01-12 20:14:25 +0100
commit2348b05b28907f087a3c066084bdc570770f0a6d (patch)
treedebda14ac121668c3da75b7b19eb811913faf59b
parenta6f29f8d093a1a88a936c2beaecc56aeca6a3901 (diff)
Switch to absolute paths in Dockerfiles
It updates functest-smoke and functest-restapi. Change-Id: If4d48f8a6ead1b9b7726a9b7b7baf6b51340a926 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 5d32eda661c476d263ebb46f486168f9adf43c1f)
-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 12abaf738..4060cd8f7 100644
--- a/docker/restapi/Dockerfile
+++ b/docker/restapi/Dockerfile
@@ -20,7 +20,7 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \
sed s/^requests===.*$/requests===2.13.0/ \
> upper-constraints.txt && \
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 \
@@ -29,7 +29,7 @@ RUN apk --no-cache add --update nodejs nodejs-npm 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 15197f936..841ea152d 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -14,13 +14,13 @@ RUN apk --no-cache add --virtual .build-deps --update \
sed s/^requests===.*$/requests===2.13.0/ \
> upper-constraints.txt && \
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 \
-e/src/refstack-client && \
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 && \
ln -s /src/tempest /src/refstack-client/.tempest && \
virtualenv --system-site-packages /src/tempest/.venv && \