From 30c4078fd1c07e9f78d1c26f5e1b51bc9f553c09 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 7 Sep 2017 13:02:39 +0200 Subject: Use git commit id for ODL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- docker/Dockerfile | 5 +++-- docker/smoke/Dockerfile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 29439f8e5..603bc38b9 100644 --- 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 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 && \ -- cgit 1.2.3-korg