From e7f40a1d42a78c78cc5621c83ab6462498715476 Mon Sep 17 00:00:00 2001 From: Yury Kovalev <8366110+kovayur@users.noreply.github.com> Date: Thu, 9 Nov 2023 09:37:17 +0100 Subject: [PATCH] Fix deploy to integration (#1453) --- deploy/helm/probe/deploy.sh | 2 +- dp-terraform/helm/rhacs-terraform/terraform_cluster.sh | 2 +- dp-terraform/ocm/install_addon.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/helm/probe/deploy.sh b/deploy/helm/probe/deploy.sh index e639286e25..e4877913a8 100755 --- a/deploy/helm/probe/deploy.sh +++ b/deploy/helm/probe/deploy.sh @@ -20,7 +20,7 @@ ENVIRONMENT=$1 CLUSTER_NAME=$2 PROBE_IMAGE_ORG="rhacs-eng" PROBE_IMAGE_NAME="blackbox-monitoring-probe-service" -PROBE_IMAGE_TAG="$(make -C "${ROOT_DIR}" tag)" +PROBE_IMAGE_TAG="$(make --quiet --no-print-directory -C "${ROOT_DIR}" tag)" PROBE_IMAGE="quay.io/${PROBE_IMAGE_ORG}/${PROBE_IMAGE_NAME}:${PROBE_IMAGE_TAG}" init_chamber diff --git a/dp-terraform/helm/rhacs-terraform/terraform_cluster.sh b/dp-terraform/helm/rhacs-terraform/terraform_cluster.sh index 17e6765fc9..baa91dde4a 100755 --- a/dp-terraform/helm/rhacs-terraform/terraform_cluster.sh +++ b/dp-terraform/helm/rhacs-terraform/terraform_cluster.sh @@ -117,7 +117,7 @@ fi FLEETSHARD_SYNC_ORG="app-sre" FLEETSHARD_SYNC_IMAGE="acs-fleet-manager" -FLEETSHARD_SYNC_TAG="$(make -C "${ROOT_DIR}" tag)" +FLEETSHARD_SYNC_TAG="$(make --quiet --no-print-directory -C "${ROOT_DIR}" tag)" if [[ "${HELM_DRY_RUN:-}" == "true" ]]; then "${ROOT_DIR}/scripts/check_image_exists.sh" "${FLEETSHARD_SYNC_ORG}" "${FLEETSHARD_SYNC_IMAGE}" "${FLEETSHARD_SYNC_TAG}" 0 || echo >&2 "Ignoring failed image check in dry-run mode." diff --git a/dp-terraform/ocm/install_addon.sh b/dp-terraform/ocm/install_addon.sh index c0bd04e98f..90c4b62ebf 100755 --- a/dp-terraform/ocm/install_addon.sh +++ b/dp-terraform/ocm/install_addon.sh @@ -90,7 +90,7 @@ fi FLEETSHARD_SYNC_ORG="app-sre" FLEETSHARD_SYNC_IMAGE="acs-fleet-manager" -FLEETSHARD_SYNC_TAG="$(make -C "${ROOT_DIR}" tag)" +FLEETSHARD_SYNC_TAG="$(make --quiet --no-print-directory -C "${ROOT_DIR}" tag)" if [[ "${ADDON_DRY_RUN:-}" == "true" ]]; then "${ROOT_DIR}/scripts/check_image_exists.sh" "${FLEETSHARD_SYNC_ORG}" "${FLEETSHARD_SYNC_IMAGE}" "${FLEETSHARD_SYNC_TAG}" 0 || echo >&2 "Ignoring failed image check in dry-run mode."