From 091d6204cbd41971698e02315d6fde0852d41730 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Tue, 2 May 2023 15:38:42 +0200 Subject: [PATCH] Disable build image integration tests on aarch64 linux and mac See gh-35229 --- .../gradle/tasks/bundling/BootBuildImageIntegrationTests.java | 2 ++ .../java/org/springframework/boot/maven/BuildImageTests.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java index 7fbcdee652..4fc75060ff 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java @@ -60,6 +60,8 @@ import static org.assertj.core.api.Assertions.assertThat; */ @GradleCompatibility(configurationCache = true) @DisabledIfDockerUnavailable +@org.springframework.boot.testsupport.junit.DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", + disabledReason = "The builder image has no ARM support") class BootBuildImageIntegrationTests { GradleBuild gradleBuild; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java index 343e84114c..d78d6a4940 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java @@ -25,6 +25,7 @@ import java.util.Random; import java.util.stream.IntStream; import org.junit.jupiter.api.TestTemplate; +import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.buildpack.platform.docker.DockerApi; @@ -45,6 +46,8 @@ import static org.assertj.core.api.Assertions.assertThat; */ @ExtendWith(MavenBuildExtension.class) @DisabledIfDockerUnavailable +@org.springframework.boot.testsupport.junit.DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", + disabledReason = "The builder image has no ARM support") class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate