Skip to content

Commit ed4ab66

Browse files
committed
Enable LoaderIntegrationTests on aarch64
Closes gh-37654
1 parent 0205b87 commit ed4ab66

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.function.Supplier;
2424
import java.util.stream.Stream;
2525

26-
import org.junit.jupiter.api.condition.OS;
2726
import org.junit.jupiter.params.ParameterizedTest;
2827
import org.junit.jupiter.params.provider.MethodSource;
2928
import org.testcontainers.containers.GenericContainer;
@@ -34,7 +33,6 @@
3433
import org.testcontainers.utility.MountableFile;
3534

3635
import org.springframework.boot.system.JavaVersion;
37-
import org.springframework.boot.testsupport.junit.DisabledOnOs;
3836
import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
3937
import org.springframework.util.Assert;
4038

@@ -46,8 +44,6 @@
4644
* @author Phillip Webb
4745
*/
4846
@DisabledIfDockerUnavailable
49-
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
50-
disabledReason = "Not all docker images have ARM support")
5147
class LoaderIntegrationTests {
5248

5349
private final ToStringConsumer output = new ToStringConsumer();
@@ -124,8 +120,10 @@ static JavaRuntime openJdk(JavaVersion version) {
124120
}
125121

126122
static JavaRuntime oracleJdk17() {
123+
String arch = System.getProperty("os.arch");
124+
String dockerFile = ("aarch64".equals(arch)) ? "Dockerfile-aarch64" : "Dockerfile";
127125
ImageFromDockerfile image = new ImageFromDockerfile("spring-boot-loader/oracle-jdk-17")
128-
.withFileFromFile("Dockerfile", new File("src/intTest/resources/conf/oracle-jdk-17/Dockerfile"));
126+
.withFileFromFile("Dockerfile", new File("src/intTest/resources/conf/oracle-jdk-17/" + dockerFile));
129127
return new JavaRuntime("Oracle JDK 17", JavaVersion.SEVENTEEN, () -> new GenericContainer<>(image));
130128
}
131129

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM ubuntu:jammy-20230624
2+
RUN apt-get update && \
3+
apt-get install -y software-properties-common curl && \
4+
mkdir -p /opt/oraclejdk && \
5+
cd /opt/oraclejdk && \
6+
curl -L https://download.oracle.com/java/17/archive/jdk-17.0.8_linux-aarch64_bin.tar.gz | tar zx --strip-components=1
7+
ENV JAVA_HOME /opt/oraclejdk
8+
ENV PATH $JAVA_HOME/bin:$PATH

0 commit comments

Comments
 (0)