From: Patrice Buriez <patrice.buriez@intel.com>
Date: Thu, 13 Sep 2018 13:01:32 +0000 (+0200)
Subject: Fix Yardstick Docker image ARM build
X-Git-Tag: opnfv-7.0.0~56
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F62255%2F3;p=yardstick.git

Fix Yardstick Docker image ARM build

Soften sed pattern, in order to cope with new contents of
ansible/install.yaml, recently modified by change 61173.

Previous sed pattern does not work anymore against this changed line:
https://gerrit.opnfv.org/gerrit/#/c/61173/4/ansible/install.yaml@39

JIRA: YARDSTICK-1411

Change-Id: I1e1ebd454900252c29263e746470e18e3139e016
Signed-off-by: Patrice Buriez <patrice.buriez@intel.com>
---

diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
index bad472007..6c32404ca 100644
--- a/docker/Dockerfile.aarch64.patch
+++ b/docker/Dockerfile.aarch64.patch
@@ -38,7 +38,7 @@ index 71ce6b58..fce7c116 100644
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/storperf ${STORPERF_REPO_DIR}
 
 -RUN ansible-playbook -i ${YARDSTICK_REPO_DIR}/ansible/install-inventory.ini -c local -vvv -e INSTALLATION_MODE="container" ${YARDSTICK_REPO_DIR}/ansible/install.yaml
-+RUN sed -i -e '/- configure_gui/d' ${YARDSTICK_REPO_DIR}/ansible/install.yaml && \
++RUN sed -i -e '/configure_gui/d' ${YARDSTICK_REPO_DIR}/ansible/install.yaml && \
 +    ansible-playbook -i ${YARDSTICK_REPO_DIR}/ansible/install-inventory.ini -c local -vvv -e INSTALLATION_MODE="container" ${YARDSTICK_REPO_DIR}/ansible/install.yaml
 
  RUN ${YARDSTICK_REPO_DIR}/docker/supervisor.sh