From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 14 Dec 2016 16:04:21 +0000 (+0100)
Subject: Switch to ODL beryllium-sr4
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f997334b94759d7bc50455121df810cc4a5b67b1;p=functest.git

Switch to ODL beryllium-sr4

It switches ODL_TAG to beryllium-sr4 which integrates the following
patches [1] and [2] which were part of OPNFV functest.

[1] https://git.opendaylight.org/gerrit/#/c/46910/
[2] https://git.opendaylight.org/gerrit/#/c/46749/

Conflicts:
      docker/Dockerfile

Change-Id: Ibc7e9eb1dc5dadff024562e6d077242688192ba9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit c89d8a5a410bf3fd47d594bddf0913cf54e4427b)
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a3d7f05e9..90f9a5bbf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -31,7 +31,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
 ARG BRANCH=stable/colorado
 ARG TEMPEST_TAG=12.2.0
 ARG RALLY_TAG=0.5.0
-ARG ODL_TAG=release/beryllium-sr3
+ARG ODL_TAG=release/beryllium-sr4
 ARG OPENSTACK_TAG=stable/mitaka
 ARG KINGBIRD_TAG=0.2.2
 ARG VIMS_TAG=stable