diff options
author | Alexandru Nemes <alexandru.nemes@enea.com> | 2017-05-16 15:50:27 +0300 |
---|---|---|
committer | Alexandru Nemes <alexandru.nemes@enea.com> | 2017-07-03 11:39:35 +0000 |
commit | 241b693baaec90347d08e63eb1dc167a0033ec21 (patch) | |
tree | a0c0599bd0e8cdebd9df2d8ee958bb73c4c4fbc3 /docker | |
parent | 0367765435e89f1590c6db25b74880b8014164c8 (diff) |
Yardstick: Aarch64 jenkins slave support
Change-Id: I2d58c38d75fc1fe036769340e9fb02932f543510
Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com>
Diffstat (limited to 'docker')
-rw-r--r-- | docker/Dockerfile.aarch64.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch new file mode 100644 index 000000000..33c352a1b --- /dev/null +++ b/docker/Dockerfile.aarch64.patch @@ -0,0 +1,42 @@ +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/
\ No newline at end of file |