From c3e48ccef64acc6ba31823e1c8d6138eebbffb8c Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 24 Apr 2018 19:34:54 +0200 Subject: Check build.sh via bashate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I367d87539ce25d9d114ee1f75b2f8af383408865 Signed-off-by: Cédric Ollivier (cherry picked from commit f351c301be1396e5dd578209c606a111afbc8758) --- build.sh | 18 +++++++++++++----- test-requirements.txt | 1 + tox.ini | 8 +++++++- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 2ac12bfc..136aba74 100644 --- a/build.sh +++ b/build.sh @@ -10,14 +10,22 @@ docker/smoke \ docker/features"} build_opts=(--pull=true --no-cache --force-rm=true) -find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-kubernetes-core:fraser|${repo}/functest-kubernetes-core:fraser|g" {} + -find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-kubernetes-healthcheck:fraser|${repo}/functest-kubernetes-healthcheck:fraser|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-kubernetes-core:fraser|\ +${repo}/functest-kubernetes-core:fraser|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-kubernetes-healthcheck:fraser|\ +${repo}/functest-kubernetes-healthcheck:fraser|g" {} + for dir in ${amd64_dirs}; do - (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-kubernetes-${dir##**/}:fraser" .) + (cd "${dir}" && docker build "${build_opts[@]}" \ + -t "${repo}/functest-kubernetes-${dir##**/}:fraser" .) docker push "${repo}/functest-kubernetes-${dir##**/}:fraser" - [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-kubernetes-${dir##**/}:fraser" || true) + [ "${dir}" != "docker/core" ] && + (docker rmi "${repo}/functest-kubernetes-${dir##**/}:fraser" || true) done -[ ! -z "${amd64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-healthcheck:fraser" "${repo}/functest-kubernetes-core:fraser" alpine:3.7 || true) +[ ! -z "${amd64_dirs}" ] && + (docker rmi "${repo}/functest-kubernetes-healthcheck:fraser" \ + "${repo}/functest-kubernetes-core:fraser" alpine:3.7 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/test-requirements.txt b/test-requirements.txt index d5e15e2a..a5d7b9b7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,3 +7,4 @@ nose # LGPL flake8<2.6.0,>=2.5.4 # MIT pylint==1.4.5 # GPLv2 yamllint +bashate>=0.5.1 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 5a1dc713..c4331d6d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = pep8,pylint,yamllint,py27,py35 +envlist = pep8,pylint,yamllint,bashate,py27,py35 [testenv] usedevelop = True @@ -35,3 +35,9 @@ files = docker commands = yamllint {[testenv:yamllint]files} + +[testenv:bashate] +basepython = python2.7 +files = + build.sh +commands = bashate {[testenv:bashate]files} -- cgit 1.2.3-korg