Skip to content

Commit

Permalink
Merge pull request #25832 from holly-cummins/holly-oracle-m1
Browse files Browse the repository at this point in the history
  • Loading branch information
@gastaldi
gastaldi authored May 31, 2022
2 parents 008c585 + 35b2240 commit 68d4dc6
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 3 deletions.
40 changes: 38 additions & 2 deletions extensions/reactive-oracle-client/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,16 @@
<ORACLE_PASSWORD>hibernate_orm_test</ORACLE_PASSWORD>
</env>
<log>
<prefix>Oracle Database: </prefix>
<prefix>Oracle Database:</prefix>
<date>default</date>
<color>red</color>
</log>
<wait>
<!-- good docs found at: http://dmp.fabric8.io/#build-healthcheck -->
<!-- Unfortunately booting this is slow, needs to set a generous timeout: -->
<time>60000</time>
<log>DATABASE IS READY TO USE!</log>
<!-- leversge the healthcheck in the image we use -->
<healthy>yes</healthy>
</wait>
</run>
</image>
Expand Down Expand Up @@ -200,6 +201,41 @@
</plugins>
</build>
</profile>

<!-- In general, we want to avoid os- or arch-based guards on tests, but the Oracle
db would not start on M1 - see https://stackoverflow.com/questions/68605011/oracle-12c-docker-setup-on-apple-m1-->
<profile>
<id>mac-m1</id>
<activation>
<os>
<arch>aarch64</arch>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${oracle.image}</name>
<run>
<skip>true</skip>
</run>
</image>
</images>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
35 changes: 34 additions & 1 deletion integration-tests/jpa-oracle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,40 @@
</plugins>
</build>
</profile>

<!-- In general, we want to avoid os- or arch-based guards on tests, but the Oracle
db would not start on M1 - see https://stackoverflow.com/questions/68605011/oracle-12c-docker-setup-on-apple-m1-->
<profile>
<id>mac-m1</id>
<activation>
<os>
<arch>aarch64</arch>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${oracle.image}</name>
<run>
<skip>true</skip>
</run>
</image>
</images>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
34 changes: 34 additions & 0 deletions integration-tests/reactive-oracle-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,40 @@
</plugins>
</build>
</profile>
<!-- In general, we want to avoid os- or arch-based guards on tests, but the Oracle
db would not start on M1 - see https://stackoverflow.com/questions/68605011/oracle-12c-docker-setup-on-apple-m1-->
<profile>
<id>mac-m1</id>
<activation>
<os>
<arch>aarch64</arch>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${oracle.image}</name>
<run>
<skip>true</skip>
</run>
</image>
</images>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>

0 comments on commit 68d4dc6

Please sign in to comment.