From 472492d42c19929229db3bb71cb2b71ddf43ca02 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 7 Oct 2019 21:42:05 +0200 Subject: Publish first Functest K8s Jerma containers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It leverages on latest K8s tag (v1.16.1). Change-Id: I57014c4193c7732c4dfd46d7a29e3104eec652ec Signed-off-by: Cédric Ollivier --- build.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 2451d8a6..c6fae8d5 100644 --- a/build.sh +++ b/build.sh @@ -12,22 +12,22 @@ 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:amd64-latest|g" {} + +${repo}/functest-kubernetes-core:amd64-jerma|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-healthcheck|\ -${repo}/functest-kubernetes-healthcheck:amd64-latest|g" {} + +${repo}/functest-kubernetes-healthcheck:amd64-jerma|g" {} + for dir in ${amd64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" .) - docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" + -t "${repo}/functest-kubernetes-${dir##**/}:amd64-jerma" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-jerma" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:amd64-jerma" || true) done [ ! -z "${amd64_dirs}" ] && (docker rmi \ - "${repo}/functest-kubernetes-core:amd64-latest" \ + "${repo}/functest-kubernetes-core:amd64-jerma" \ golang:1.12-alpine3.10 || true) find . -name Dockerfile -exec git checkout {} + @@ -35,20 +35,20 @@ find . -name Dockerfile -exec sed -i \ -e "s|golang:1.12-alpine3.10|arm64v8/golang:1.12-alpine3.10|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ -${repo}/functest-kubernetes-core:arm64-latest|g" {} + +${repo}/functest-kubernetes-core:arm64-jerma|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-healthcheck|\ -${repo}/functest-kubernetes-healthcheck:arm64-latest|g" {} + +${repo}/functest-kubernetes-healthcheck:arm64-jerma|g" {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" .) - docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" + -t "${repo}/functest-kubernetes-${dir##**/}:arm64-jerma" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-jerma" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:arm64-jerma" || true) done [ ! -z "${arm64_dirs}" ] && - (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ + (docker rmi "${repo}/functest-kubernetes-core:arm64-jerma" \ arm64v8/golang:1.12-alpine3.10 || true) find . -name Dockerfile -exec git checkout {} + -- cgit 1.2.3-korg