Revert "Cleanup ensure"

This reverts commit c6fc163.

Author: Julien-Ben

scripts/release/build_images.py

@@ -1,8 +1,5 @@
 # This file is the new Sonar
 import base64
-import fcntl
-import os
-import time
 from typing import Dict
 
 import boto3
@@ -118,10 +115,7 @@ def execute_docker_build(
         if len(platforms) > 1:
             logger.info(f"Multi-platform build for {len(platforms)} architectures")
 
-        # Ensure buildx builder exists (safe for concurrent execution)
-        ensure_buildx_builder(builder_name)
-
-        # Build the image using buildx
+        # Build the image using buildx, builder must be already initialized
         docker.buildx.build(
             context_path=path,
             file=dockerfile,

scripts/release/pipeline_main.py

@@ -34,6 +34,7 @@
     BuildContext,
     BuildScenario,
 )
+from scripts.release.build_images import DEFAULT_BUILDER_NAME, ensure_buildx_builder
 
 """
 The goal of main.py, build_configuration.py and build_context.py is to provide a single source of truth for the build
@@ -145,6 +146,10 @@ def main():
     logger.info(f"Building image: {args.image}")
     logger.info(f"Build configuration: {build_config}")
 
+    # Create buildx builder
+    # It must be initialized here as opposed to in build_images.py so that parallel calls (such as agent builds) can access it
+    # and not face race conditions
+    ensure_buildx_builder(DEFAULT_BUILDER_NAME)
     build_image(args.image, build_config)