From 36d7c97ffc2d91d164142c6b331b376d2e90eaed Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 7 Apr 2018 15:01:49 +0200 Subject: Clean functest-kubernetes-healthcheck too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It could have been downloaded by functest-kubernetes-smoke. Change-Id: If02762300dd832717b7ac4d144aff22167eef986 Signed-off-by: Cédric Ollivier (cherry picked from commit 4ed19ebeea1dc11ea0a98b52e395812d83ad0e62) --- .travis.yml | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc181042..75557e02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ jobs: env: - REPO="${DOCKER_USERNAME}" - amd64_dirs="docker/features" - - stage: build functest-kubernetes-smoke + - stage: build functest-kubernetes-smoke image script: sudo -E bash build.sh env: - REPO="${DOCKER_USERNAME}" diff --git a/build.sh b/build.sh index 9a8f9432..2ac12bfc 100644 --- a/build.sh +++ b/build.sh @@ -17,7 +17,7 @@ for dir in ${amd64_dirs}; do docker push "${repo}/functest-kubernetes-${dir##**/}:fraser" [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-kubernetes-${dir##**/}:fraser" || true) done -[ ! -z "${amd64_dirs}" ] && (docker rmi "${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 $? -- cgit 1.2.3-korg