Merge pull request #37400 from gsmet/quay-reliability

Improve reliability when downloading builder images from Quay.io

Author: gsmet

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java

@@ -49,8 +49,8 @@ public void setup(boolean processInheritIODisabled) {
             // will appear to block and no output will be shown
             String effectiveBuilderImage = nativeConfig.builderImage().getEffectiveImage();
             var builderImagePull = nativeConfig.builderImage().pull();
-            log.infof("Checking status of builder image '%s'", effectiveBuilderImage);
             if (builderImagePull != NativeConfig.ImagePullStrategy.ALWAYS) {
+                log.infof("Checking status of builder image '%s'", effectiveBuilderImage);
                 Process imageInspectProcess = null;
                 try {
                     final ProcessBuilder pb = new ProcessBuilder(
@@ -82,20 +82,37 @@ public void setup(boolean processInheritIODisabled) {
                     }
                 }
             }
-            Process pullProcess = null;
+
             try {
-                final ProcessBuilder pb = new ProcessBuilder(
-                        Arrays.asList(containerRuntime.getExecutableName(), "pull", effectiveBuilderImage));
-                pullProcess = ProcessUtil.launchProcess(pb, processInheritIODisabled);
-                if (pullProcess.waitFor() != 0) {
-                    throw new RuntimeException("Failed to pull builder image '" + effectiveBuilderImage + "'");
-                }
-            } catch (IOException | InterruptedException e) {
-                throw new RuntimeException("Failed to pull builder image '" + effectiveBuilderImage + "'", e);
-            } finally {
-                if (pullProcess != null) {
-                    pullProcess.destroy();
+                log.infof("Pulling builder image '%s'", effectiveBuilderImage);
+                pull(effectiveBuilderImage, processInheritIODisabled);
+            } catch (Exception e) {
+                log.infof("Retrying in 5 seconds");
+                try {
+                    Thread.sleep(5_000L);
+                } catch (InterruptedException e1) {
+                    throw new RuntimeException(e1);
                 }
+                log.infof("Pulling builder image '%s' (take 2)", effectiveBuilderImage);
+                pull(effectiveBuilderImage, processInheritIODisabled);
+            }
+        }
+    }
+
+    private void pull(String effectiveBuilderImage, boolean processInheritIODisabled) {
+        Process pullProcess = null;
+        try {
+            final ProcessBuilder pb = new ProcessBuilder(
+                    Arrays.asList(containerRuntime.getExecutableName(), "pull", effectiveBuilderImage));
+            pullProcess = ProcessUtil.launchProcess(pb, processInheritIODisabled);
+            if (pullProcess.waitFor() != 0) {
+                throw new RuntimeException("Failed to pull builder image '" + effectiveBuilderImage + "'");
+            }
+        } catch (IOException | InterruptedException e) {
+            throw new RuntimeException("Failed to pull builder image '" + effectiveBuilderImage + "'");
+        } finally {
+            if (pullProcess != null) {
+                pullProcess.destroy();
             }
         }
     }

integration-tests/pom.xml

@@ -471,6 +471,17 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>native-ci</id>
+            <activation>
+                <property>
+                    <name>env.CI</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.native.builder-image.pull>missing</quarkus.native.builder-image.pull>
+            </properties>
+        </profile>
 
         <!-- "unbind" all default executions that make no sense for (most) integration-tests -->
         <profile>