This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v1-10-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit b5a8ca9f7ac44a4ff4c201d9e2f60fcfb59581f2 Author: Jarek Potiuk <[email protected]> AuthorDate: Tue Nov 17 20:32:00 2020 +0100 The messages about remote image check are only shown with -v (#12402) The messages might be confusing and should only be shown when verbose is turned on. (cherry picked from commit dc31ca4dc6986397b619bf21ae8628fd03cba58d) --- scripts/ci/libraries/_build_images.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/ci/libraries/_build_images.sh b/scripts/ci/libraries/_build_images.sh index a8d9521..fb756ba 100644 --- a/scripts/ci/libraries/_build_images.sh +++ b/scripts/ci/libraries/_build_images.sh @@ -225,9 +225,9 @@ function build_images::get_local_build_cache_hash() { # Remove the container just in case docker rm --force "local-airflow-ci-container" 2>/dev/null >/dev/null if ! docker create --name "local-airflow-ci-container" "${AIRFLOW_CI_IMAGE}" 2>/dev/null; then - >&2 echo - >&2 echo "Local airflow CI image not available" - >&2 echo + verbosity::print_info + verbosity::print_info "Local airflow CI image not available" + verbosity::print_info LOCAL_MANIFEST_IMAGE_UNAVAILABLE="true" export LOCAL_MANIFEST_IMAGE_UNAVAILABLE touch "${LOCAL_IMAGE_BUILD_CACHE_HASH_FILE}" @@ -237,9 +237,9 @@ function build_images::get_local_build_cache_hash() { "${LOCAL_IMAGE_BUILD_CACHE_HASH_FILE}" 2> /dev/null \ || touch "${LOCAL_IMAGE_BUILD_CACHE_HASH_FILE}" set -e - echo - echo "Local build cache hash: '$(cat "${LOCAL_IMAGE_BUILD_CACHE_HASH_FILE}")'" - echo + verbosity::print_info + verbosity::print_info "Local build cache hash: '$(cat "${LOCAL_IMAGE_BUILD_CACHE_HASH_FILE}")'" + verbosity::print_info } # Retrieves information about the build cache hash random file from the remote image. @@ -257,9 +257,9 @@ function build_images::get_remote_image_build_cache_hash() { set +e # Pull remote manifest image if ! docker pull "${AIRFLOW_CI_REMOTE_MANIFEST_IMAGE}" 2>/dev/null >/dev/null; then - >&2 echo - >&2 echo "Remote docker registry unreachable" - >&2 echo + verbosity::print_info + verbosity::print_info "Remote docker registry unreachable" + verbosity::print_info REMOTE_DOCKER_REGISTRY_UNREACHABLE="true" export REMOTE_DOCKER_REGISTRY_UNREACHABLE touch "${REMOTE_IMAGE_BUILD_CACHE_HASH_FILE}" @@ -274,9 +274,9 @@ function build_images::get_remote_image_build_cache_hash() { "${REMOTE_IMAGE_BUILD_CACHE_HASH_FILE}" docker rm --force "$(cat "${REMOTE_IMAGE_CONTAINER_ID_FILE}")" rm -f "${REMOTE_IMAGE_CONTAINER_ID_FILE}" - echo - echo "Remote build cache hash: '$(cat "${REMOTE_IMAGE_BUILD_CACHE_HASH_FILE}")'" - echo + verbosity::print_info + verbosity::print_info "Remote build cache hash: '$(cat "${REMOTE_IMAGE_BUILD_CACHE_HASH_FILE}")'" + verbosity::print_info } # Compares layers from both remote and local image and set FORCE_PULL_IMAGES to true in case
