summaryrefslogtreecommitdiffstats
path: root/docker/smoke/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-09-07 13:02:39 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-07 13:14:56 +0200
commit30c4078fd1c07e9f78d1c26f5e1b51bc9f553c09 (patch)
treeeae9ffdc547bba223fe2333f69c1b26a0f8406eb /docker/smoke/Dockerfile
parent6d52c73456246ddc3bc9426d15b94c6eedfbe85e (diff)
Use git commit id for ODL
stable/carbon has been removed and Functest requires the patch "No more Content-Type for DELETE request header" [1]. [1] https://git.opendaylight.org/gerrit/#/c/60578/ Change-Id: Ia3630e03e26a543ae37c36455a68763ffc8f2b12 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/smoke/Dockerfile')
-rw-r--r--docker/smoke/Dockerfile5
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 26a473800..3b1e8d2e7 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/ocata
-ARG ODL_TAG=release/carbon
+ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940
ARG FDS_TAG=master
COPY thirdparty-requirements.txt thirdparty-requirements.txt
@@ -19,7 +19,8 @@ RUN apk --no-cache add --virtual .build-deps --update \
-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 \
-rthirdparty-requirements.txt && \
- git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
+ 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 --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 && \