Skip to content

Commit 9a54572

Browse files
committed
Disable SQL server and Oracle database compose tests on ARM
See gh-35229
1 parent 1ce88f2 commit 9a54572

File tree

4 files changed

+16
-0
lines changed

4 files changed

+16
-0
lines changed

Diff for: spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919
import java.sql.Driver;
2020

2121
import org.junit.jupiter.api.Test;
22+
import org.junit.jupiter.api.condition.OS;
2223

2324
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
2425
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
2526
import org.springframework.boot.jdbc.DatabaseDriver;
27+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
2628
import org.springframework.jdbc.core.JdbcTemplate;
2729
import org.springframework.jdbc.datasource.SimpleDriverDataSource;
2830
import org.springframework.util.ClassUtils;
@@ -34,6 +36,8 @@
3436
*
3537
* @author Andy Wilkinson
3638
*/
39+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
40+
disabledReason = "The Oracle image has no ARM support")
3741
class OracleJdbcDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
3842

3943
OracleJdbcDockerComposeConnectionDetailsFactoryIntegrationTests() {

Diff for: spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

+4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@
2121
import io.r2dbc.spi.ConnectionFactories;
2222
import io.r2dbc.spi.ConnectionFactoryOptions;
2323
import org.junit.jupiter.api.Test;
24+
import org.junit.jupiter.api.condition.OS;
2425

2526
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
2627
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
2728
import org.springframework.boot.jdbc.DatabaseDriver;
29+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
2830
import org.springframework.r2dbc.core.DatabaseClient;
2931

3032
import static org.assertj.core.api.Assertions.assertThat;
@@ -34,6 +36,8 @@
3436
*
3537
* @author Andy Wilkinson
3638
*/
39+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
40+
disabledReason = "The Oracle image has no ARM support")
3741
class OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
3842

3943
OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests() {

Diff for: spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919
import java.sql.Driver;
2020

2121
import org.junit.jupiter.api.Test;
22+
import org.junit.jupiter.api.condition.OS;
2223

2324
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
2425
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
2526
import org.springframework.boot.jdbc.DatabaseDriver;
27+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
2628
import org.springframework.jdbc.core.JdbcTemplate;
2729
import org.springframework.jdbc.datasource.SimpleDriverDataSource;
2830
import org.springframework.util.ClassUtils;
@@ -34,6 +36,8 @@
3436
*
3537
* @author Andy Wilkinson
3638
*/
39+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
40+
disabledReason = "The SQL server image has no ARM support")
3741
class SqlServerJdbcDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
3842

3943
SqlServerJdbcDockerComposeConnectionDetailsFactoryIntegrationTests() {

Diff for: spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

+4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@
2121
import io.r2dbc.spi.ConnectionFactories;
2222
import io.r2dbc.spi.ConnectionFactoryOptions;
2323
import org.junit.jupiter.api.Test;
24+
import org.junit.jupiter.api.condition.OS;
2425

2526
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
2627
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
2728
import org.springframework.boot.jdbc.DatabaseDriver;
29+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
2830
import org.springframework.r2dbc.core.DatabaseClient;
2931

3032
import static org.assertj.core.api.Assertions.assertThat;
@@ -34,6 +36,8 @@
3436
*
3537
* @author Andy Wilkinson
3638
*/
39+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
40+
disabledReason = "The SQL server image has no ARM support")
3741
class SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests
3842
extends AbstractDockerComposeIntegrationTests {
3943

0 commit comments

Comments
 (0)