From 2698e4d07a0ae1b7713e44b42553ffaf5a4663fa Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Thu, 6 Jul 2023 16:39:15 +0200
Subject: [PATCH 1/2] fix: pull docker image by digest

---
 .../jupiter/api/extension/RegistryExtension.java            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/RegistryExtension.java b/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/RegistryExtension.java
index e83da08b..7066de76 100644
--- a/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/RegistryExtension.java
+++ b/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/RegistryExtension.java
@@ -14,8 +14,6 @@
 package org.eclipse.jkube.integrationtests.jupiter.api.extension;
 
 import io.fabric8.junit.jupiter.HasKubernetesClient;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.ServiceBuilder;
 import org.eclipse.jkube.integrationtests.cli.CliUtils;
 import org.eclipse.jkube.integrationtests.jupiter.api.DockerRegistry;
 import org.eclipse.jkube.integrationtests.jupiter.api.DockerRegistryHost;
@@ -38,6 +36,8 @@ public class RegistryExtension implements HasKubernetesClient, BeforeAllCallback
 
   private static final Logger log = LoggerFactory.getLogger(RegistryExtension.class);
 
+  private static final String DOCKER_REGISTRY_AMD64_LINUX_IMAGE = "registry:2.8.2@sha256:0f7e785a49386d7e98c502151f9b01dc5578aa4f13078a346b2c5cf50433f663";
+
   @Override
   public void beforeAll(ExtensionContext context) throws Exception {
     final var annotation = context.getRequiredTestClass().getAnnotation(DockerRegistry.class);
@@ -72,7 +72,7 @@ public void afterAll(ExtensionContext context) throws Exception {
   private static CliUtils.CliResult startRegularDockerRegistry(DockerRegistry dockerRegistry) throws IOException, InterruptedException {
     log.debug(() -> "Starting standard Docker Registry");
     return CliUtils.runCommand("docker run --rm -d -p " + dockerRegistry.port() +":5000 --name " +
-      getName(dockerRegistry) + " registry:2");
+      getName(dockerRegistry) + " " + DOCKER_REGISTRY_AMD64_LINUX_IMAGE);
   }
 
   private static CliUtils.CliResult startWindowsDockerRegistry(DockerRegistry dockerRegistry) throws IOException, InterruptedException {

From f1fbca7ae646fc7109dbc2cb2584336ffaf2c3bd Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Fri, 7 Jul 2023 07:33:57 +0200
Subject: [PATCH 2/2] fix: use specific Gradle version

---
 .../jupiter/api/extension/GradleExtension.java             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/GradleExtension.java b/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/GradleExtension.java
index f636005f..20c4b185 100644
--- a/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/GradleExtension.java
+++ b/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/GradleExtension.java
@@ -26,6 +26,8 @@
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -53,7 +55,7 @@ public void beforeEach(ExtensionContext context) throws Exception {
     }
   }
 
-  private JKubeGradleRunner getJKubeGradleRunner(ExtensionContext context) throws IOException, InterruptedException {
+  private JKubeGradleRunner getJKubeGradleRunner(ExtensionContext context) throws URISyntaxException {
     synchronized (context.getRoot()) {
       var singletonJKubeGradleRunner = getStore(context).get(JKubeGradleRunner.class, JKubeGradleRunner.class);
       if (singletonJKubeGradleRunner != null) {
@@ -70,7 +72,8 @@ private JKubeGradleRunner getJKubeGradleRunner(ExtensionContext context) throws
       }
       var projectPath = rootPath.resolve("projects-to-be-tested").resolve("gradle");
       var gradleRunner = GradleRunner.create()
-        .withGradleInstallation(getGradleInstallation())
+        .withGradleDistribution(new URI("https://services.gradle.org/distributions/gradle-7.6-bin.zip"))
+//        .withGradleInstallation(getGradleInstallation())
         .withProjectDir(projectPath.toFile());
       if (annotation.forwardOutput()) {
         gradleRunner.forwardOutput();