From 7d7d2efe247b8da745be9d14406929e8d6ec031f Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Wed, 22 Sep 2021 15:27:51 +0200
Subject: [PATCH] Fix image retagging when pulling the images

The change #17883 missed re-tagging images after downloading
which caused unnecessary image rebuilding for PRs as well as using
wrong image for doc building - previous version of docs were used
when building docs!
---
 scripts/ci/images/ci_prepare_ci_image_on_ci.sh         | 1 +
 scripts/ci/images/ci_prepare_prod_image_on_ci.sh       | 1 +
 scripts/ci/images/ci_wait_for_and_verify_ci_image.sh   | 2 ++
 scripts/ci/images/ci_wait_for_and_verify_prod_image.sh | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/scripts/ci/images/ci_prepare_ci_image_on_ci.sh b/scripts/ci/images/ci_prepare_ci_image_on_ci.sh
index 8fe92990e106c..9dd105324fcb2 100755
--- a/scripts/ci/images/ci_prepare_ci_image_on_ci.sh
+++ b/scripts/ci/images/ci_prepare_ci_image_on_ci.sh
@@ -33,6 +33,7 @@ function build_ci_image_on_ci() {
         md5sum::calculate_md5sum_for_all_files
         local image_name_with_tag="${AIRFLOW_CI_IMAGE}:${GITHUB_REGISTRY_PULL_IMAGE_TAG}"
         push_pull_remove_images::wait_for_image "${image_name_with_tag}"
+        docker_v tag  "${image_name_with_tag}" "${AIRFLOW_CI_IMAGE}"
         md5sum::update_all_md5_with_group
     else
         build_images::rebuild_ci_image_if_needed
diff --git a/scripts/ci/images/ci_prepare_prod_image_on_ci.sh b/scripts/ci/images/ci_prepare_prod_image_on_ci.sh
index 0aea3c7fdfd7b..49cb06a374ee7 100755
--- a/scripts/ci/images/ci_prepare_prod_image_on_ci.sh
+++ b/scripts/ci/images/ci_prepare_prod_image_on_ci.sh
@@ -34,6 +34,7 @@ function build_prod_images_on_ci() {
     if [[ ${GITHUB_REGISTRY_WAIT_FOR_IMAGE} == "true" ]]; then
         local image_name_with_tag="${AIRFLOW_PROD_IMAGE}:${GITHUB_REGISTRY_PULL_IMAGE_TAG}"
         push_pull_remove_images::wait_for_image "${image_name_with_tag}"
+        docker_v tag  "${image_name_with_tag}" "${AIRFLOW_PROD_IMAGE}"
     else
         build_images::build_prod_images_from_locally_built_airflow_packages
     fi
diff --git a/scripts/ci/images/ci_wait_for_and_verify_ci_image.sh b/scripts/ci/images/ci_wait_for_and_verify_ci_image.sh
index bc5034a58fabd..fb93e568d5279 100755
--- a/scripts/ci/images/ci_wait_for_and_verify_ci_image.sh
+++ b/scripts/ci/images/ci_wait_for_and_verify_ci_image.sh
@@ -37,3 +37,5 @@ push_pull_remove_images::wait_for_image "${image_name_with_tag}"
 if [[ ${VERIFY_IMAGE=} != "false" ]]; then
     verify_image::verify_ci_image "${image_name_with_tag}"
 fi
+
+docker_v tag  "${image_name_with_tag}" "${AIRFLOW_CI_IMAGE}"
diff --git a/scripts/ci/images/ci_wait_for_and_verify_prod_image.sh b/scripts/ci/images/ci_wait_for_and_verify_prod_image.sh
index bc2f80f25ce99..4a79abdc6cf4a 100755
--- a/scripts/ci/images/ci_wait_for_and_verify_prod_image.sh
+++ b/scripts/ci/images/ci_wait_for_and_verify_prod_image.sh
@@ -36,3 +36,5 @@ push_pull_remove_images::wait_for_image "${image_name_with_tag}"
 if [[ ${VERIFY_IMAGE=} != "false" ]]; then
     verify_image::verify_prod_image "${image_name_with_tag}"
 fi
+
+docker_v tag  "${image_name_with_tag}" "${AIRFLOW_PROD_IMAGE}"