Skip to content

Commit 7b2a830

Browse files
committed
Align Oracle DB setup in quarkus-it-hibernate-reactive-oracle on other ITs
E.g. on quarkus-reactive-oracle-client-deployment, quarkus-it-jpa-oracle. Because the current setup doesn't seem to work.
1 parent e0c832e commit 7b2a830

File tree

2 files changed

+72
-12
lines changed

2 files changed

+72
-12
lines changed

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

Lines changed: 71 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<description>Hibernate Reactive related tests running with the Oracle database</description>
1515

1616
<properties>
17-
<reactive-oracle.url>vertx-reactive:oracle:thin:@localhost:1520/hibernate_orm_test</reactive-oracle.url>
17+
<reactive-oracle.url>vertx-reactive:oracle:thin:@localhost:1521/FREEPDB1</reactive-oracle.url>
1818
</properties>
1919

2020
<dependencies>
@@ -188,20 +188,26 @@
188188
<name>${oracle.image}</name>
189189
<alias>oracle</alias>
190190
<run>
191+
<ports>
192+
<port>1521:1521</port>
193+
</ports>
191194
<env>
192-
<ORACLE_DATABASE>hibernate_orm_test</ORACLE_DATABASE>
193195
<ORACLE_PASSWORD>hibernate_orm_test</ORACLE_PASSWORD>
194-
<APP_USER>hibernate_orm_test</APP_USER>
195-
<APP_USER_PASSWORD>hibernate_orm_test</APP_USER_PASSWORD>
196196
</env>
197-
<ports>
198-
<port>1520:1521</port>
199-
</ports>
200197
<log>
201-
<prefix>ORACLE:</prefix>
198+
<prefix>Oracle Database:</prefix>
202199
<date>default</date>
203-
<color>cyan</color>
200+
<color>red</color>
204201
</log>
202+
<wait>
203+
<!-- good docs found at: https://dmp.fabric8.io/#build-healthcheck -->
204+
<!-- Unfortunately booting this is slow, needs to set a generous timeout: -->
205+
<time>60000</time>
206+
<!-- leverage the healthcheck in the image we use -->
207+
<healthy>yes</healthy>
208+
<!-- In case of any issues with the built-in healthcheck we can revert back to the original log check:-->
209+
<!--<log>DATABASE IS READY TO USE!</log>-->
210+
</wait>
205211
</run>
206212
</image>
207213
</images>
@@ -212,10 +218,9 @@
212218
<executions>
213219
<execution>
214220
<id>docker-start</id>
215-
<phase>pre-integration-test</phase>
221+
<phase>compile</phase>
216222
<goals>
217223
<goal>stop</goal>
218-
<goal>build</goal>
219224
<goal>start</goal>
220225
</goals>
221226
</execution>
@@ -247,6 +252,61 @@
247252
</plugins>
248253
</build>
249254
</profile>
255+
256+
<!-- In general, we want to avoid os- or arch-based guards on tests, but the Oracle
257+
db would not start on M1 - see https://stackoverflow.com/questions/68605011/oracle-12c-docker-setup-on-apple-m1 -->
258+
<profile>
259+
<id>mac-m1</id>
260+
<activation>
261+
<os>
262+
<arch>aarch64</arch>
263+
</os>
264+
</activation>
265+
<build>
266+
<plugins>
267+
<plugin>
268+
<artifactId>maven-surefire-plugin</artifactId>
269+
<configuration>
270+
<skip>true</skip>
271+
</configuration>
272+
</plugin>
273+
<plugin>
274+
<groupId>io.fabric8</groupId>
275+
<artifactId>docker-maven-plugin</artifactId>
276+
<configuration>
277+
<images>
278+
<image>
279+
<name>${oracle.image}</name>
280+
<run>
281+
<skip>true</skip>
282+
</run>
283+
</image>
284+
</images>
285+
</configuration>
286+
</plugin>
287+
</plugins>
288+
</build>
289+
</profile>
290+
<!-- Disabled pending fix of #33094 -->
291+
<profile>
292+
<id>podman</id>
293+
<activation>
294+
<property>
295+
<name>env.IS_PODMAN</name>
296+
<value>true</value>
297+
</property>
298+
</activation>
299+
<build>
300+
<plugins>
301+
<plugin>
302+
<artifactId>maven-surefire-plugin</artifactId>
303+
<configuration>
304+
<skip>true</skip>
305+
</configuration>
306+
</plugin>
307+
</plugins>
308+
</build>
309+
</profile>
250310
</profiles>
251311

252312

integration-tests/hibernate-reactive-oracle/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
quarkus.datasource.db-kind=oracle
2-
quarkus.datasource.username=hibernate_orm_test
2+
quarkus.datasource.username=SYSTEM
33
quarkus.datasource.password=hibernate_orm_test
44

55
# Hibernate config

0 commit comments

Comments
 (0)