aboutsummaryrefslogtreecommitdiffstats
path: root/docs/release/release-notes/functest-release.rst
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-08-14 12:57:44 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-08-14 12:58:37 +0200
commit0928ebd8964bc1ef9f22b6598fcdf388d84e533d (patch)
tree8dc1ca574d7135a8a6673c40cde61f0a9a9aa5f8 /docs/release/release-notes/functest-release.rst
parent5beb864bf6e1409e367a3fdf33289cb5386079fa (diff)
Conforms Vmtp with create_server_timeout
https://build.opnfv.org/ci/view/functest/job/functest-fuel-baremetal-daily-master/387/console Change-Id: I3ef130bf5ad4b46f26776feeaa434ca528965f36 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docs/release/release-notes/functest-release.rst')
0 files changed, 0 insertions, 0 deletions
r: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
From: Alexandru Nemes <alexandru.nemes@enea.com>
Date: Mon, 19 Jun 2017 14:18:24 +0300
Subject: [PATCH] Patch for Yardstick AARCH64 Docker file

Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com>
---
 docker/Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 96a5d77..03307a2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
+# Copyright (c) 2017 Enea AB and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -7,9 +7,9 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################

-FROM ubuntu:14.04
+FROM aarch64/ubuntu:14.04

-LABEL image=opnfv/yardstick
+LABEL image=opnfv/yardstick_aarch64

 ARG BRANCH=master

@@ -40,8 +40,8 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf

 EXPOSE 5000

-ADD http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img ${IMAGE_DIR}
-ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img ${IMAGE_DIR}
+ADD http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-disk.img ${IMAGE_DIR}
+ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-disk1.img ${IMAGE_DIR}

 COPY ./exec_tests.sh /usr/local/bin/