Skip to content

Commit 4e98c0d

Browse files
geoandgeoand
authored
Merge pull request #49721 from zakkak/2025-08-27-revert-arch-filters
Re-enable oracle DB test on AArch64
2 parents fd5e920 + 3d03a64 commit 4e98c0d

File tree

5 files changed

+11
-154
lines changed

5 files changed

+11
-154
lines changed

‎build-parent/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,13 +1139,24 @@
11391139
<id>mac-m1</id>
11401140
<activation>
11411141
<os>
1142+
<family>mac</family>
11421143
<arch>aarch64</arch>
11431144
</os>
11441145
</activation>
11451146
<properties>
11461147
<!-- Podman compatibility. Currently, mac file systems based on Plan 9 does not support SELinux labeling z and Z should not be used. When they transition to use virtiofsd, it should support SELinux labeling, and then we can use it for better container separation on the Mac.-->
11471148
<volume.access.modifier></volume.access.modifier>
1149+
</properties>
1150+
</profile>
11481151

1152+
<profile>
1153+
<id>aarch64</id>
1154+
<activation>
1155+
<os>
1156+
<arch>aarch64</arch>
1157+
</os>
1158+
</activation>
1159+
<properties>
11491160
<!-- See
11501161
https://github.com/microsoft/mssql-docker/issues/668 and https://stackoverflow.com/questions/65398641/docker-connect-sql-server-container-non-zero-code-1/66919852#66919852.
11511162
The MS SQL image segfaults on ARM. Azure Edge is not fully compatible, but it is better than not running the tests at all. -->

‎extensions/reactive-oracle-client/deployment/pom.xml‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -226,40 +226,6 @@
226226
</build>
227227
</profile>
228228

229-
<!-- In general, we want to avoid os- or arch-based guards on tests, but the Oracle
230-
db would not start on M1 - see https://stackoverflow.com/questions/68605011/oracle-12c-docker-setup-on-apple-m1 -->
231-
<profile>
232-
<id>mac-m1</id>
233-
<activation>
234-
<os>
235-
<arch>aarch64</arch>
236-
</os>
237-
</activation>
238-
<build>
239-
<plugins>
240-
<plugin>
241-
<artifactId>maven-surefire-plugin</artifactId>
242-
<configuration>
243-
<skip>true</skip>
244-
</configuration>
245-
</plugin>
246-
<plugin>
247-
<groupId>io.fabric8</groupId>
248-
<artifactId>docker-maven-plugin</artifactId>
249-
<configuration>
250-
<images>
251-
<image>
252-
<name>${oracle.image}</name>
253-
<run>
254-
<skip>true</skip>
255-
</run>
256-
</image>
257-
</images>
258-
</configuration>
259-
</plugin>
260-
</plugins>
261-
</build>
262-
</profile>
263229
<!-- Disabled pending fix of #33094 -->
264230
<profile>
265231
<id>podman</id>

‎integration-tests/hibernate-reactive-oracle/pom.xml‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -252,46 +252,6 @@
252252
</build>
253253
</profile>
254254

255-
<!-- In general, we want to avoid os- or arch-based guards on tests, but the Oracle
256-
db would not start on M1 - see https://stackoverflow.com/questions/68605011/oracle-12c-docker-setup-on-apple-m1 -->
257-
<profile>
258-
<id>mac-m1</id>
259-
<activation>
260-
<os>
261-
<arch>aarch64</arch>
262-
</os>
263-
</activation>
264-
<build>
265-
<plugins>
266-
<plugin>
267-
<artifactId>maven-surefire-plugin</artifactId>
268-
<configuration>
269-
<skip>true</skip>
270-
</configuration>
271-
</plugin>
272-
<plugin>
273-
<artifactId>maven-failsafe-plugin</artifactId>
274-
<configuration>
275-
<skipITs>true</skipITs>
276-
</configuration>
277-
</plugin>
278-
<plugin>
279-
<groupId>io.fabric8</groupId>
280-
<artifactId>docker-maven-plugin</artifactId>
281-
<configuration>
282-
<images>
283-
<image>
284-
<name>${oracle.image}</name>
285-
<run>
286-
<skip>true</skip>
287-
</run>
288-
</image>
289-
</images>
290-
</configuration>
291-
</plugin>
292-
</plugins>
293-
</build>
294-
</profile>
295255
<!-- Disabled pending fix of #33094 -->
296256
<profile>
297257
<id>podman</id>

‎integration-tests/jpa-oracle/pom.xml‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -260,46 +260,6 @@
260260
</plugins>
261261
</build>
262262
</profile>
263-
<!-- In general, we want to avoid os- or arch-based guards on tests, but the Oracle
264-
db would not start on M1 - see https://stackoverflow.com/questions/68605011/oracle-12c-docker-setup-on-apple-m1 -->
265-
<profile>
266-
<id>mac-m1</id>
267-
<activation>
268-
<os>
269-
<arch>aarch64</arch>
270-
</os>
271-
</activation>
272-
<build>
273-
<plugins>
274-
<plugin>
275-
<artifactId>maven-surefire-plugin</artifactId>
276-
<configuration>
277-
<skip>true</skip>
278-
</configuration>
279-
</plugin>
280-
<plugin>
281-
<artifactId>maven-failsafe-plugin</artifactId>
282-
<configuration>
283-
<skipITs>true</skipITs>
284-
</configuration>
285-
</plugin>
286-
<plugin>
287-
<groupId>io.fabric8</groupId>
288-
<artifactId>docker-maven-plugin</artifactId>
289-
<configuration>
290-
<images>
291-
<image>
292-
<name>${oracle.image}</name>
293-
<run>
294-
<skip>true</skip>
295-
</run>
296-
</image>
297-
</images>
298-
</configuration>
299-
</plugin>
300-
</plugins>
301-
</build>
302-
</profile>
303263
</profiles>
304264

305265
</project>

‎integration-tests/reactive-oracle-client/pom.xml‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -225,46 +225,6 @@
225225
</plugins>
226226
</build>
227227
</profile>
228-
<!-- In general, we want to avoid os- or arch-based guards on tests, but the Oracle
229-
db would not start on M1 - see https://stackoverflow.com/questions/68605011/oracle-12c-docker-setup-on-apple-m1 -->
230-
<profile>
231-
<id>mac-m1</id>
232-
<activation>
233-
<os>
234-
<arch>aarch64</arch>
235-
</os>
236-
</activation>
237-
<build>
238-
<plugins>
239-
<plugin>
240-
<artifactId>maven-surefire-plugin</artifactId>
241-
<configuration>
242-
<skip>true</skip>
243-
</configuration>
244-
</plugin>
245-
<plugin>
246-
<artifactId>maven-failsafe-plugin</artifactId>
247-
<configuration>
248-
<skipITs>true</skipITs>
249-
</configuration>
250-
</plugin>
251-
<plugin>
252-
<groupId>io.fabric8</groupId>
253-
<artifactId>docker-maven-plugin</artifactId>
254-
<configuration>
255-
<images>
256-
<image>
257-
<name>${oracle.image}</name>
258-
<run>
259-
<skip>true</skip>
260-
</run>
261-
</image>
262-
</images>
263-
</configuration>
264-
</plugin>
265-
</plugins>
266-
</build>
267-
</profile>
268228
</profiles>
269229

270230
</project>

0 commit comments

Comments
 (0)