summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-08-17 10:01:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-17 10:01:12 +0000
commit55edeaa617a25dffae699b9b5b5b4f61e7856fd6 (patch)
treeb7f8f782909ceb0a76cdd863af83468e99dfbb17
parent94d1bddfdd97379e50e4c12f26116441e836d0f6 (diff)
parent332714c9276655b7127ad9582d00d505a6324251 (diff)
Merge "Update ODL tag to release/carbon"
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/smoke/Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1811e9389..910be8396 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=0.8.1
-ARG ODL_TAG=release/beryllium-sr4
+ARG ODL_TAG=release/carbon
ARG OPENSTACK_TAG=stable/ocata
ARG KINGBIRD_TAG=1.1.0
ARG VIMS_TAG=stable
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 223ed64d0..103854703 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/beryllium-sr4
+ARG ODL_TAG=release/carbon
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --virtual .build-deps --update \