From d20653f306107baec1e0b9c7f879b1ac58e830d7 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 20 Sep 2017 10:52:33 +0200 Subject: Support https when testing ODL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It conforms with the last change on ODL tests [1]. Neutron endpoint is passed via robot args instead of Neutron ip. Keystone url (based on OS_AUTH_URL) is passed too to replace Keystone ip. [1] https://git.opendaylight.org/gerrit/#/c/63293/ Conflicts: docker/restapi/Dockerfile docker/smoke/Dockerfile Change-Id: Ie44f55304a438b1b0289ec69ac2241664be70e80 Signed-off-by: Cédric Ollivier (cherry picked from commit dd99f5356ef08f3a2a1ed18d63492391390df752) --- docker/Dockerfile | 2 +- docker/restapi/Dockerfile | 2 +- docker/smoke/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 2e59adad6..76a70955d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container" # Environment variables ARG BRANCH=stable/euphrates ARG RALLY_TAG=stable/0.9 -ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2 +ARG ODL_TAG=e12ba90cd27577c4c6c70ee54f7d599b5f6777ba ARG OPENSTACK_TAG=stable/ocata ARG VIMS_TAG=stable ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 50eb8a890..3021c839a 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -2,7 +2,7 @@ FROM opnfv/functest-core:euphrates ARG BRANCH=stable/euphrates ARG OPENSTACK_TAG=stable/ocata -ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2 +ARG ODL_TAG=e12ba90cd27577c4c6c70ee54f7d599b5f6777ba ARG FDS_TAG=stable/euphrates ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 ARG VIMS_TAG=stable diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 82043840a..b1443c792 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -2,7 +2,7 @@ FROM opnfv/functest-core:euphrates ARG BRANCH=stable/euphrates ARG OPENSTACK_TAG=stable/ocata -ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2 +ARG ODL_TAG=e12ba90cd27577c4c6c70ee54f7d599b5f6777ba ARG FDS_TAG=stable/euphrates ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 -- cgit 1.2.3-korg