diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-04-24 19:34:54 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-04-24 19:34:54 +0200 |
| commit | f351c301be1396e5dd578209c606a111afbc8758 (patch) | |
| tree | 274749f9c7437f0de29cd813dcd627361f6c49d2 | |
| parent | 2041b4bb57cb1d9efe4b9b0c2d9f0f4079ee3bea (diff) | |
Check build.sh via bashate
Change-Id: I367d87539ce25d9d114ee1f75b2f8af383408865
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | build.sh | 20 | ||||
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rw-r--r-- | tox.ini | 8 |
3 files changed, 22 insertions, 7 deletions
@@ -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|${repo}/functest-kubernetes-core|g" {} + -find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-kubernetes-healthcheck|${repo}/functest-kubernetes-healthcheck|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-kubernetes-core|${repo}/functest-kubernetes-core|g" \ + {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-kubernetes-healthcheck|\ +${repo}/functest-kubernetes-healthcheck|g" {} + for dir in ${amd64_dirs}; do - (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-kubernetes-${dir##**/}" .) - docker push "${repo}/functest-kubernetes-${dir##**/}" - [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-kubernetes-${dir##**/}" || true) + (cd "${dir}" && docker build "${build_opts[@]}" \ + -t "${repo}/functest-kubernetes-${dir##**/}" .) + #docker push "${repo}/functest-kubernetes-${dir##**/}" + [ "${dir}" != "docker/core" ] && + (docker rmi "${repo}/functest-kubernetes-${dir##**/}" || true) done -[ ! -z "${amd64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-healthcheck" "${repo}/functest-kubernetes-core" alpine:3.7 || true) +[ ! -z "${amd64_dirs}" ] && + (docker rmi "${repo}/functest-kubernetes-healthcheck" \ + "${repo}/functest-kubernetes-core" alpine:3.7 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/test-requirements.txt b/test-requirements.txt index 9fb8500e..2876290a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,3 +7,4 @@ nose>=1.3.7 # LGPL flake8<2.6.0,>=2.5.4 # MIT pylint==1.4.5 # GPLv2 yamllint +bashate>=0.5.1 # Apache-2.0 @@ -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} |