Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2024-05-16 17:22:36 +01:00
parent 133336de20 feaccef3a4
commit d77fcf30fa
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java
View File

@@ -36,6 +36,7 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.IOUtils;
import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.BuildResult;
import org.gradle.testkit.runner.TaskOutcome; import org.gradle.testkit.runner.TaskOutcome;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.condition.OS;
@@ -300,8 +301,10 @@ class BootBuildImageIntegrationTests {
} }
@TestTemplate @TestTemplate
@EnabledOnOs(value = OS.LINUX, disabledReason = "Works with Docker Engine on Linux but is not reliable with " @EnabledOnOs(value = OS.LINUX,
+ "Docker Desktop on other OSs") disabledReason = "Works with Docker Engine on Linux but is not reliable with "
+ "Docker Desktop on other OSs")
@Disabled("gh-40760")
void buildsImageWithBindCaches() throws IOException { void buildsImageWithBindCaches() throws IOException {
writeMainClass(); writeMainClass();
writeLongNameResource(); writeLongNameResource();

7
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java
View File

@@ -25,6 +25,7 @@ import java.time.OffsetDateTime;
import java.util.Random; import java.util.Random;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.condition.OS;
@@ -401,8 +402,10 @@ class BuildImageTests extends AbstractArchiveIntegrationTests {
} }
@TestTemplate @TestTemplate
@EnabledOnOs(value = OS.LINUX, disabledReason = "Works with Docker Engine on Linux but is not reliable with " @EnabledOnOs(value = OS.LINUX,
+ "Docker Desktop on other OSs") disabledReason = "Works with Docker Engine on Linux but is not reliable with "
+ "Docker Desktop on other OSs")
@Disabled("gh-40760")
void whenBuildImageIsInvokedWithBindCaches(MavenBuild mavenBuild) { void whenBuildImageIsInvokedWithBindCaches(MavenBuild mavenBuild) {
String testBuildId = randomString(); String testBuildId = randomString();
mavenBuild.project("build-image-bind-caches") mavenBuild.project("build-image-bind-caches")