Merge branch '2.7.x' into 3.0.x

fstab · May 3, 2023 · c2dd20f · c2dd20f
2 parents 2c27ec5 + f5eb760
commit c2dd20f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/...c/intTest/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java b/...c/intTest/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,11 @@
 
 import java.util.List;
 
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import org.springframework.boot.testsupport.junit.DisabledOnOs;
 import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -32,6 +34,8 @@
  * @author Andy Wilkinson
  */
 @DisabledIfDockerUnavailable
+@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
+		disabledReason = "The docker images have no ARM support")
 class JarLaunchScriptIntegrationTests extends AbstractLaunchScriptIntegrationTests {
 
 	JarLaunchScriptIntegrationTests() {

diff --git a/...Test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java b/...Test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java
@@ -20,10 +20,12 @@
 import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import org.springframework.boot.ansi.AnsiColor;
+import org.springframework.boot.testsupport.junit.DisabledOnOs;
 import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,6 +38,8 @@
  * @author Alexey Vinogradov
  */
 @DisabledIfDockerUnavailable
+@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
+		disabledReason = "The docker images have no ARM support")
 class SysVinitLaunchScriptIntegrationTests extends AbstractLaunchScriptIntegrationTests {
 
 	SysVinitLaunchScriptIntegrationTests() {

diff --git a/...loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/...loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
@@ -23,6 +23,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
@@ -33,6 +34,7 @@
 import org.testcontainers.utility.MountableFile;
 
 import org.springframework.boot.system.JavaVersion;
+import org.springframework.boot.testsupport.junit.DisabledOnOs;
 import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
 import org.springframework.util.Assert;
 
@@ -44,6 +46,8 @@
  * @author Phillip Webb
  */
 @DisabledIfDockerUnavailable
+@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
+		disabledReason = "Not all docker images have ARM support")
 class LoaderIntegrationTests {
 
 	private final ToStringConsumer output = new ToStringConsumer();