From 99dabca319721305c3ae791f15972cacf04c332f Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 24 Apr 2020 11:27:12 +0200 Subject: [PATCH] add build step logging to multi-arch build With extra logging, there is no need to call `travis_wait` anymore. In addition the `travis_wait` command blocks output, so the build steps are not reported until the script finishes. Signed-off-by: Niels de Vos --- .travis.yml | 2 +- scripts/build-multi-arch-image.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5bf1c889c..b1b654a21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,7 @@ jobs: - stage: build testing name: Build multi-architecture image for amd64 and arm64 script: - - travis_wait ./scripts/build-multi-arch-image.sh || travis_terminate 1; + - ./scripts/build-multi-arch-image.sh || travis_terminate 1; - stage: build testing name: containerized test (Fedora) and build (CentOS) diff --git a/scripts/build-multi-arch-image.sh b/scripts/build-multi-arch-image.sh index 4908be1ab..08656d1b4 100755 --- a/scripts/build-multi-arch-image.sh +++ b/scripts/build-multi-arch-image.sh @@ -1,4 +1,8 @@ #!/bin/bash + +# shellcheck source=scripts/build_step.inc.sh +source "$(dirname "${0}")/build_step.inc.sh" + set -xe # "docker manifest" requires experimental feature enabled export DOCKER_CLI_EXPERIMENTAL=enabled @@ -21,6 +25,7 @@ baseimg=$(awk -F = '/^ARG BASE_IMAGE=/ {print $NF}' "${dockerfile}") manifests=$(docker manifest inspect "${baseimg}" | jq '.manifests[] | {arch: .platform.architecture, digest: .digest}') # qemu-user-static is to enable an execution of different multi-architecture containers by QEMU # more info at https://github.com/multiarch/qemu-user-static +build_step "starting multiarch/qemu-user-static container" docker run --rm --privileged multiarch/qemu-user-static --reset -p yes # build and push per arch images for ARCH in amd64 arm64; do @@ -29,5 +34,6 @@ for ARCH in amd64 arm64; do digest=$(awk -v ARCH=${ARCH} '{if (archfound) {print $NF; exit 0}}; {archfound=($0 ~ "arch.*"ARCH)}' <<<"${manifests}") IFS=$ifs base_img=${baseimg}@${digest} + build_step "make image-cephcsi for ${ARCH}" GOARCH=${ARCH} BASE_IMAGE=${base_img} make image-cephcsi done