From 35b2240e76b2568263b41280c2f486a193513a20 Mon Sep 17 00:00:00 2001
From: Holly Cummins <hcummins@redhat.com>
Date: Tue, 10 May 2022 12:13:31 +0100
Subject: [PATCH] Correct cut and paste of wrong db details

Disable oracle db tests on Mac M1 because of segfault
---
 .../reactive-oracle-client/deployment/pom.xml | 40 ++++++++++++++++++-
 integration-tests/jpa-oracle/pom.xml          | 35 +++++++++++++++-
 .../reactive-oracle-client/pom.xml            | 34 ++++++++++++++++
 3 files changed, 106 insertions(+), 3 deletions(-)

diff --git a/extensions/reactive-oracle-client/deployment/pom.xml b/extensions/reactive-oracle-client/deployment/pom.xml
index 4dca4904e4256..bd1fcbd7a273f 100644
--- a/extensions/reactive-oracle-client/deployment/pom.xml
+++ b/extensions/reactive-oracle-client/deployment/pom.xml
@@ -146,7 +146,7 @@
                                             <ORACLE_PASSWORD>hibernate_orm_test</ORACLE_PASSWORD>
                                         </env>
                                         <log>
-                                            <prefix>Oracle Database: </prefix>
+                                            <prefix>Oracle Database:</prefix>
                                             <date>default</date>
                                             <color>red</color>
                                         </log>
@@ -154,7 +154,8 @@
                                             <!-- 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>
@@ -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>
diff --git a/integration-tests/jpa-oracle/pom.xml b/integration-tests/jpa-oracle/pom.xml
index ad911555e5fa0..5447dff91c1eb 100644
--- a/integration-tests/jpa-oracle/pom.xml
+++ b/integration-tests/jpa-oracle/pom.xml
@@ -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>
diff --git a/integration-tests/reactive-oracle-client/pom.xml b/integration-tests/reactive-oracle-client/pom.xml
index d0fba78dc9bcb..8316c24756734 100644
--- a/integration-tests/reactive-oracle-client/pom.xml
+++ b/integration-tests/reactive-oracle-client/pom.xml
@@ -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>