From f83b1d068b3f8eafdcf43af609333eddbbe51d09 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Fri, 14 Jun 2019 17:40:53 +0200
Subject: [PATCH] Turn all bashate warnings as errors
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: Ic350ed8269347f5853a6d7b4e75cfccba6d85dcf
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 12b1a3258219cd301866ea79924e08cfb2a7420e)
---
 build.sh | 11 ++++++++---
 tox.ini  |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 78bac6d39..a3155afa1 100644
--- a/build.sh
+++ b/build.sh
@@ -24,7 +24,9 @@ build_opts=(--pull=true --no-cache --force-rm=true)
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-core:iruya|${repo}/functest-core:amd64-iruya|g" {} +
 find . -name Dockerfile -exec sed -i \
-    -e "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:amd64-iruya|g" {} +
+    -e \
+    "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:amd64-iruya|g" \
+    {} +
 for dir in ${amd64_dirs}; do
     (cd "${dir}" &&
         docker build "${build_opts[@]}" \
@@ -42,7 +44,9 @@ find . -name Dockerfile -exec sed -i \
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-core:iruya|${repo}/functest-core:arm64-iruya|g" {} +
 find . -name Dockerfile -exec sed -i \
-    -e "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:arm64-iruya|g" {} +
+    -e \
+    "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:arm64-iruya|g" \
+    {} +
 for dir in ${arm64_dirs}; do
     (cd "${dir}" && docker build "${build_opts[@]}" \
         -t "${repo}/functest-${dir##**/}:arm64-iruya" .)
@@ -60,7 +64,8 @@ find . -name Dockerfile -exec sed -i \
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-core:iruya|${repo}/functest-core:arm-iruya|g" {} +
 find . -name Dockerfile -exec sed -i \
-    -e "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:arm-iruya|g" {} +
+    -e \
+    "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:arm-iruya|g" {} +
 for dir in ${arm_dirs}; do
     (cd "${dir}" && docker build "${build_opts[@]}" \
         -t "${repo}/functest-${dir##**/}:arm-iruya" .)
diff --git a/tox.ini b/tox.ini
index 7d182a47f..222544503 100644
--- a/tox.ini
+++ b/tox.ini
@@ -73,7 +73,7 @@ files =
   functest/ci/convert_images.sh
   functest/ci/download_images.sh
   build.sh
-commands = bashate {[testenv:bashate]files}
+commands = bashate -e E005,E006,E042,E043 {[testenv:bashate]files}
 
 
 [testenv:bandit]
-- 
2.16.6