skip docker image rebuild

Author: MyroTk

.github/workflows/release_branches.yml

@@ -35,7 +35,7 @@ jobs:
   #         cd "$GITHUB_WORKSPACE/tests/ci"
   #         python3 docker_images_check.py --suffix aarch64
   #     - name: Upload images files to artifacts
-  #       uses: actions/upload-artifact@v2
+  #       uses: actions/download-artifact@v4
   #       with:
   #         name: changed_images_aarch64
   #         path: ${{ runner.temp }}/docker_images_check/changed_images_aarch64.json
@@ -82,7 +82,7 @@ jobs:
   #         cd "$GITHUB_WORKSPACE/tests/ci"
   #         python3 docker_manifests_merge.py --suffix amd64 --suffix aarch64
   #     - name: Upload images files to artifacts
-  #       uses: actions/upload-artifact@v2
+  #       uses: actions/download-artifact@v4
   #       with:
   #         name: changed_images
   #         path: ${{ runner.temp }}/changed_images.json
@@ -201,7 +201,7 @@ jobs:
   #         cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
   #         cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
   #     - name: Upload build URLs to artifacts
-  #       uses: actions/upload-artifact@v2
+  #       uses: actions/download-artifact@v4
   #       with:
   #         name: ${{ env.BUILD_URLS }}
   #         path: ${{ runner.temp }}/build_check/${{ env.BUILD_URLS }}.json
@@ -230,9 +230,9 @@ jobs:
       - name: Check docker altinity/clickhouse-server building
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 docker_server.py --release-type head --push \
+          python3 docker_server.py --release-type head \
             --image-repo altinity/clickhouse-server --image-path docker/server
-          python3 docker_server.py --release-type head --push \
+          python3 docker_server.py --release-type head \
             --image-repo altinity/clickhouse-keeper --image-path docker/keeper
       - name: Cleanup
         if: always()
@@ -672,7 +672,7 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 sign_release.py
       - name: Upload signed hashes
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: signed-hashes
           path: ${{ env.TEMP_PATH }}/*.gpg

tests/ci/docker_images_check.py

@@ -106,23 +106,43 @@ def get_changed_docker_images(
         str(files_changed),
     )
 
-    # Rebuild all images
-    changed_images = [DockerImage(dockerfile_dir, image_description["name"], image_description.get("only_amd64", False)) for dockerfile_dir, image_description in images_dict.items()]
-
-    # for dockerfile_dir, image_description in images_dict.items():
-    #     for f in files_changed:
-    #         if f.startswith(dockerfile_dir):
-    #             name = image_description["name"]
-    #             only_amd64 = image_description.get("only_amd64", False)
-    #             logging.info(
-    #                 "Found changed file '%s' which affects "
-    #                 "docker image '%s' with path '%s'",
-    #                 f,
-    #                 name,
-    #                 dockerfile_dir,
-    #             )
-    #             changed_images.append(DockerImage(dockerfile_dir, name, only_amd64))
-    #             break
+    # Find changed images
+    all_images = []
+    changed_images = []
+    for dockerfile_dir, image_description in images_dict.items():
+        all_images.append(DockerImage(dockerfile_dir, image_description["name"], image_description.get("only_amd64", False)))
+        for f in files_changed:
+            if f.startswith(dockerfile_dir):
+                name = image_description["name"]
+                only_amd64 = image_description.get("only_amd64", False)
+                logging.info(
+                    "Found changed file '%s' which affects "
+                    "docker image '%s' with path '%s'",
+                    f,
+                    name,
+                    dockerfile_dir,
+                )
+                changed_images.append(DockerImage(dockerfile_dir, name, only_amd64))
+                break
+
+    # Rebuild all images on push, release, or scheduled run
+    if pr_info.number in [0,1]:
+        changed_images = all_images
+
+    else:
+        # Rebuild all on opened PR
+        if pr_info.event['action'] in ['opened', 'reopened']:
+            changed_images = all_images
+
+        # Check that image for the PR exists
+        elif pr_info.event['action'] == 'synchronize':
+            unchanged_images = [
+                image for image in all_images if image not in changed_images
+            ]
+            logging.info(f"Unchanged images: {unchanged_images}")
+            for image in unchanged_images:
+                if subprocess.run(f"docker manifest inspect {image.repo}:{pr_info.number}", shell=True).returncode != 0:
+                    changed_images.append(image)
 
     # The order is important: dependents should go later than bases, so that
     # they are built with updated base versions.