Fixes problem with Python image not ready to be pushed (apache#10430)

potiuk · web-flow · commit c979de70bd67 · 2020-08-21T21:50:06.000+02:00
When we pull image from base registry we should also push it to the GitHub Registry so that we can track the origin of the run. Note that it merely pushes the tag - the image will be directly pulled from the registry so this will only update the tag in registry. Bug introduced in apache#10368
diff --git a/scripts/ci/images/ci_prepare_ci_image_on_ci.sh b/scripts/ci/images/ci_prepare_ci_image_on_ci.sh
@@ -31,11 +31,21 @@ function build_ci_image_on_ci() {
         # Pretend that the image was build. We already have image with the right sources baked in!
         calculate_md5sum_for_all_files
 
-        # Tries to wait for the image indefinitely
+        # Tries to wait for the images indefinitely
         # skips further image checks - since we already have the target image
 
-        wait_for_image_tag "${GITHUB_REGISTRY_AIRFLOW_CI_IMAGE}" "${GITHUB_REGISTRY_PULL_IMAGE_TAG}" \
-            "${GITHUB_REGISTRY_AIRFLOW_CI_IMAGE}" "${AIRFLOW_CI_IMAGE}"
+        PYTHON_TAG_SUFFIX=""
+        if [[ ${GITHUB_REGISTRY_PUSH_IMAGE_TAG} != "latest" ]]; then
+            PYTHON_TAG_SUFFIX="-${GITHUB_REGISTRY_PULL_IMAGE_TAG}"
+        fi
+        # first we pull base python image. We will need it to re-push it after master build
+        # Becoming the new "latest" image for other builds
+        wait_for_image_tag "${GITHUB_REGISTRY_PYTHON_BASE_IMAGE}" \
+            "${PYTHON_TAG_SUFFIX}" "${PYTHON_BASE_IMAGE}"
+
+        # And then the base image
+        wait_for_image_tag "${GITHUB_REGISTRY_AIRFLOW_CI_IMAGE}" \
+            ":${GITHUB_REGISTRY_PULL_IMAGE_TAG}" "${AIRFLOW_CI_IMAGE}"
 
         update_all_md5_files
     else
diff --git a/scripts/ci/images/ci_prepare_prod_image_on_ci.sh b/scripts/ci/images/ci_prepare_prod_image_on_ci.sh
@@ -32,11 +32,11 @@ function build_prod_images_on_ci() {
         # Tries to wait for the image indefinitely
         # skips further image checks - since we already have the target image
 
-        wait_for_image_tag "${GITHUB_REGISTRY_AIRFLOW_PROD_IMAGE}" "${GITHUB_REGISTRY_PULL_IMAGE_TAG}" \
-            "${GITHUB_REGISTRY_AIRFLOW_PROD_IMAGE}" "${AIRFLOW_PROD_IMAGE}"
+        wait_for_image_tag "${GITHUB_REGISTRY_AIRFLOW_PROD_IMAGE}" \
+            ":${GITHUB_REGISTRY_PULL_IMAGE_TAG}" "${AIRFLOW_PROD_IMAGE}"
 
-        wait_for_image_tag "${GITHUB_REGISTRY_AIRFLOW_PROD_BUILD_IMAGE}" "${GITHUB_REGISTRY_PULL_IMAGE_TAG}" \
-            "${GITHUB_REGISTRY_AIRFLOW_PROD_BUILD_IMAGE}" "${AIRFLOW_PROD_BUILD_IMAGE}"
+        wait_for_image_tag "${GITHUB_REGISTRY_AIRFLOW_PROD_BUILD_IMAGE}" \
+            ":${GITHUB_REGISTRY_PULL_IMAGE_TAG}" "${AIRFLOW_PROD_BUILD_IMAGE}"
     fi
 
     build_prod_images
diff --git a/scripts/ci/libraries/_build_images.sh b/scripts/ci/libraries/_build_images.sh
@@ -702,14 +702,14 @@ function build_prod_images() {
 # Waits for image tag to appear in Github Registry, pulls it and tags with the target tag
 # Parameters:
 #  $1 - image name to wait for
-#  $2 - tag to wait for
+#  $2 - suffix of the image to wait for
 #  $3, $4, ... - target tags to tag the image with
 function wait_for_image_tag {
     IMAGE_NAME="${1}"
-    TAG_TO_WAIT_FOR=${2}
+    IMAGE_SUFFIX=${2}
     shift 2
 
-    IMAGE_TO_WAIT_FOR="${IMAGE_NAME}:${TAG_TO_WAIT_FOR}"
+    IMAGE_TO_WAIT_FOR="${IMAGE_NAME}${IMAGE_SUFFIX}"
     echo
     echo "Waiting for image ${IMAGE_TO_WAIT_FOR}"
     echo
@@ -722,8 +722,12 @@ function wait_for_image_tag {
             sleep 10
         else
             echo
-            echo "The image ${IMAGE_TO_WAIT_FOR} downloaded."
+            echo "The image ${IMAGE_TO_WAIT_FOR} with '${IMAGE_NAME}' tag"
             echo
+            echo
+            echo "Tagging ${IMAGE_TO_WAIT_FOR} as ${IMAGE_NAME}."
+            echo
+            docker tag  "${IMAGE_TO_WAIT_FOR}" "${IMAGE_NAME}"
             for TARGET_TAG in "${@}"; do
                 echo
                 echo "Tagging ${IMAGE_TO_WAIT_FOR} as ${TARGET_TAG}."
