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>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 29439f8..603bc38 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
 # Environment variables
 ARG BRANCH=master
 ARG RALLY_TAG=stable/0.9
-ARG ODL_TAG=release/carbon
+ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940
 ARG OPENSTACK_TAG=stable/ocata
 ARG VIMS_TAG=stable
 ARG REPOS_DIR=/home/opnfv/repos
@@ -99,7 +99,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 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test
+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 --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

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 26a4738..3b1e8d2 100644 (file)
--- 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 && \