1 From: Cristina Pauna <cristina.pauna@enea.com>
2 Date: Mon, 23 Jul 2018 15:16:59 +0300
3 Subject: [PATCH] Patch for Yardstick AARCH64 Docker file
5 Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
7 docker/Dockerfile | 14 ++++++++------
8 1 file changed, 8 insertions(+), 6 deletions(-)
10 diff --git a/docker/Dockerfile b/docker/Dockerfile
11 index 71ce6b58..fce7c116 100644
12 --- a/docker/Dockerfile
13 +++ b/docker/Dockerfile
15 # http://www.apache.org/licenses/LICENSE-2.0
16 ##############################################################################
19 +FROM arm64v8/ubuntu:16.04
21 -LABEL image=opnfv/yardstick
22 +LABEL image=opnfv/yardstick_aarch64
26 @@ -24,7 +24,8 @@ ENV YARDSTICK_REPO_DIR="${REPOS_DIR}/yardstick/" \
27 RELENG_REPO_DIR="${REPOS_DIR}/releng" \
28 STORPERF_REPO_DIR="${REPOS_DIR}/storperf"
30 -RUN apt-get update && apt-get install -y git python python-setuptools python-pip iputils-ping && apt-get -y autoremove && apt-get clean
31 +RUN apt-get update && apt-get install -y git python python-setuptools python-pip iputils-ping && apt-get -y autoremove && \
32 + apt-get install -y libssl-dev && apt-get -y install libffi-dev && apt-get clean
33 RUN easy_install -U setuptools==30.0.0
34 RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 openstacksdk==0.11.3 python-openstackclient==3.14.2 python-heatclient==1.14.0 ansible==2.5.5
36 @@ -40,7 +41,8 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${Y
37 RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
38 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/storperf ${STORPERF_REPO_DIR}
40 -RUN ansible-playbook -i ${YARDSTICK_REPO_DIR}/ansible/install-inventory.ini -c local -vvv -e INSTALLATION_MODE="container" ${YARDSTICK_REPO_DIR}/ansible/install.yaml
41 +RUN sed -i -e '/configure_gui/d' ${YARDSTICK_REPO_DIR}/ansible/install.yaml && \
42 + ansible-playbook -i ${YARDSTICK_REPO_DIR}/ansible/install-inventory.ini -c local -vvv -e INSTALLATION_MODE="container" ${YARDSTICK_REPO_DIR}/ansible/install.yaml
44 RUN ${YARDSTICK_REPO_DIR}/docker/supervisor.sh
46 @@ -48,8 +50,8 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
47 # nginx=5000, rabbitmq=5672
50 -ADD http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img ${IMAGE_DIR}
51 -ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img ${IMAGE_DIR}
52 +ADD http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-disk.img ${IMAGE_DIR}
53 +ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-disk1.img ${IMAGE_DIR}
55 # For developers: when `docker build ...` is running from YARDSTICK_REPO_DIR, please change
56 # path `./exec_tests.sh` -> `./docker/exec_tests.sh``.