Merge pull request #4674 from ggiguash/optimize_mirror_images

USHIFT-5406: Optimize mirror images operation for repetitive runs

Author: openshift-merge-bot[bot]

scripts/mirror-images.sh

@@ -72,14 +72,8 @@ function mirror_registry() {
         skopeo_retry copy ${skopeo_opts} --quiet \
             --preserve-digests \
             --authfile "${img_pull_file}" \
+            --additional-tag "${dst_img_no_tag}:latest" \
             docker://"${src_img}" docker://"${dst_img}"
-
-        echo "Tagging '${dst_img_no_tag}' as 'latest'"
-        # shellcheck disable=SC2086
-        skopeo_retry copy ${skopeo_opts} --quiet \
-            --preserve-digests \
-            --authfile "${img_pull_file}" \
-            docker://"${dst_img}" docker://"${dst_img_no_tag}:latest"
     }
 
     # Export functions for xargs to use
@@ -153,14 +147,8 @@ function dir_to_registry() {
         skopeo_retry copy ${skopeo_opts} --quiet \
             --preserve-digests \
             --authfile "${img_pull_file}" \
+            --additional-tag "${dst_img_no_tag}:latest" \
             dir://"${local_dir}/${src_img}" docker://"${dst_img}"
-
-        echo "Tagging '${dst_img}' as '${dst_img_no_tag}:latest'"
-        # shellcheck disable=SC2086
-        skopeo_retry copy ${skopeo_opts} --quiet \
-            --preserve-digests \
-            --authfile "${img_pull_file}" \
-            docker://"${dst_img}" docker://"${dst_img_no_tag}:latest"
     }
 
     # Export functions for xargs to use

test/bin/mirror_registry.sh

@@ -266,8 +266,8 @@ finalize_registry() {
     # Ensure that permissions are open for the current user on the mirror registry
     # directories and files. This is necessary to avoid 'find' command errors.
     sudo chgrp -R "$(id -gn)" "${MIRROR_REGISTRY_DIR}"
-    sudo find "${MIRROR_REGISTRY_DIR}" -type d -exec sudo chmod a+rx '{}' \;
-    sudo find "${MIRROR_REGISTRY_DIR}" -type f -exec sudo chmod a+r  '{}' \;
+    sudo find "${MIRROR_REGISTRY_DIR}" -type d -exec chmod a+rx '{}' +
+    sudo find "${MIRROR_REGISTRY_DIR}" -type f -exec chmod a+r  '{}' +
 }
 
 mirror_images() {