From 85d329e616a3577f903b00cafd41671d8d5c944d Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 14 Jun 2019 17:40:53 +0200 Subject: Turn all bashate warnings as errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic350ed8269347f5853a6d7b4e75cfccba6d85dcf Signed-off-by: Cédric Ollivier (cherry picked from commit 12b1a3258219cd301866ea79924e08cfb2a7420e) --- build.sh | 12 +++++++++--- tox.ini | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 82e075240..d7d726266 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:hunter|${repo}/functest-core:amd64-hunter|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-tempest:hunter|${repo}/functest-tempest:amd64-hunter|g" {} + + -e \ + "s|opnfv/functest-tempest:hunter|${repo}/functest-tempest:amd64-hunter|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:hunter|${repo}/functest-core:arm64-hunter|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-tempest:hunter|${repo}/functest-tempest:arm64-hunter|g" {} + + -e \ + "s|opnfv/functest-tempest:hunter|${repo}/functest-tempest:arm64-hunter|g" \ + {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ -t "${repo}/functest-${dir##**/}:arm64-hunter" .) @@ -60,7 +64,9 @@ find . -name Dockerfile -exec sed -i \ find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:hunter|${repo}/functest-core:arm-hunter|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-tempest:hunter|${repo}/functest-tempest:arm-hunter|g" {} + + -e \ + "s|opnfv/functest-tempest:hunter|${repo}/functest-tempest:arm-hunter|g" \ + {} + for dir in ${arm_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ -t "${repo}/functest-${dir##**/}:arm-hunter" .) diff --git a/tox.ini b/tox.ini index 055a53a97..e81414b22 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] -- cgit 1.2.3-korg