Skip to content

Commit 3e691c6

Browse files
authored
Disable Oracle tests on Mac M1 Arch
Oracle does not have support for docker images on M1 Arch
1 parent fdca0a4 commit 3e691c6

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/oracle/OracleContainerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import org.apache.commons.dbcp2.BasicDataSource;
2222
import org.junit.jupiter.api.BeforeAll;
23+
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
2324
import org.testcontainers.containers.OracleContainer;
2425
import org.testcontainers.junit.jupiter.Testcontainers;
2526
import org.testcontainers.utility.DockerImageName;
@@ -36,6 +37,7 @@
3637
* @since 6.0.8
3738
*/
3839
@Testcontainers(disabledWithoutDocker = true)
40+
@DisabledIfSystemProperty(named = "os.arch", matches = ".*aarch64.*")
3941
public interface OracleContainerTest {
4042

4143
OracleContainer ORACLE_CONTAINER =

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/oracle/OracleJdbcMessageStoreTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.junit.jupiter.api.AfterEach;
2929
import org.junit.jupiter.api.BeforeEach;
3030
import org.junit.jupiter.api.Test;
31+
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
3132

3233
import org.springframework.beans.factory.annotation.Autowired;
3334
import org.springframework.context.annotation.Bean;
@@ -60,6 +61,7 @@
6061
*/
6162
@SpringJUnitConfig
6263
@DirtiesContext
64+
@DisabledIfSystemProperty(named = "os.arch", matches = ".*aarch64.*")
6365
public class OracleJdbcMessageStoreTests implements OracleContainerTest {
6466

6567
private static final Log LOG = LogFactory.getLog(OracleJdbcMessageStoreTests.class);

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/oracle/OracleLockRegistryTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.concurrent.locks.Lock;
2424

2525
import org.junit.jupiter.api.Test;
26+
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
2627

2728
import org.springframework.beans.factory.annotation.Autowired;
2829
import org.springframework.context.annotation.Bean;
@@ -48,6 +49,7 @@
4849
*/
4950
@SpringJUnitConfig
5051
@DirtiesContext
52+
@DisabledIfSystemProperty(named = "os.arch", matches = ".*aarch64.*")
5153
public class OracleLockRegistryTests implements OracleContainerTest {
5254

5355
@Autowired

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/OracleTxTimeoutMessageStoreTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.integration.jdbc.store.channel;
1818

1919
import org.junit.jupiter.api.AfterEach;
20+
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
2021

2122
import org.springframework.integration.jdbc.oracle.OracleContainerTest;
2223
import org.springframework.jdbc.core.JdbcTemplate;
@@ -30,6 +31,7 @@
3031
*
3132
*/
3233
@ContextConfiguration
34+
@DisabledIfSystemProperty(named = "os.arch", matches = ".*aarch64.*")
3335
public class OracleTxTimeoutMessageStoreTests extends AbstractTxTimeoutMessageStoreTests implements OracleContainerTest {
3436

3537
@AfterEach

0 commit comments

Comments
 (0)