Skip to content

Commit 091d620

Browse files
committed
Disable build image integration tests on aarch64 linux and mac
See gh-35229
1 parent 312f0c1 commit 091d620

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
*/
6161
@GradleCompatibility(configurationCache = true)
6262
@DisabledIfDockerUnavailable
63+
@org.springframework.boot.testsupport.junit.DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
64+
disabledReason = "The builder image has no ARM support")
6365
class BootBuildImageIntegrationTests {
6466

6567
GradleBuild gradleBuild;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.stream.IntStream;
2626

2727
import org.junit.jupiter.api.TestTemplate;
28+
import org.junit.jupiter.api.condition.OS;
2829
import org.junit.jupiter.api.extension.ExtendWith;
2930

3031
import org.springframework.boot.buildpack.platform.docker.DockerApi;
@@ -45,6 +46,8 @@
4546
*/
4647
@ExtendWith(MavenBuildExtension.class)
4748
@DisabledIfDockerUnavailable
49+
@org.springframework.boot.testsupport.junit.DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
50+
disabledReason = "The builder image has no ARM support")
4851
class BuildImageTests extends AbstractArchiveIntegrationTests {
4952

5053
@TestTemplate

0 commit comments

Comments
 (0)