Skip to content

Commit 5da5a30

Browse files
holly-cumminsholly-cummins
authored
Merge pull request #51059 from holly-cummins/convert-oracle-tests-to-devservices
Stop using the fabric8 docker maven plugin for Oracle databases
2 parents c56223b + 253dfc9 commit 5da5a30

File tree

6 files changed

+0
-181
lines changed

6 files changed

+0
-181
lines changed

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

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
<name>Quarkus - Integration Tests - Hibernate Reactive - Oracle</name>
1414
<description>Hibernate Reactive related tests running with the Oracle database</description>
1515

16-
<properties>
17-
<reactive-oracle.url>vertx-reactive:oracle:thin:@localhost:1521/FREEPDB1</reactive-oracle.url>
18-
</properties>
19-
2016
<dependencies>
2117
<dependency>
2218
<groupId>io.quarkus</groupId>
@@ -179,59 +175,6 @@
179175
</activation>
180176
<build>
181177
<plugins>
182-
<plugin>
183-
<groupId>io.fabric8</groupId>
184-
<artifactId>docker-maven-plugin</artifactId>
185-
<configuration>
186-
<images>
187-
<image>
188-
<name>${oracle.image}</name>
189-
<run>
190-
<ports>
191-
<port>1521:1521</port>
192-
</ports>
193-
<env>
194-
<ORACLE_PASSWORD>hibernate_orm_test</ORACLE_PASSWORD>
195-
</env>
196-
<log>
197-
<prefix>Oracle Database: </prefix>
198-
<date>default</date>
199-
<color>red</color>
200-
</log>
201-
<wait>
202-
<!-- good docs found at: https://dmp.fabric8.io/#build-healthcheck -->
203-
<!-- Unfortunately booting this is slow, needs to set a generous timeout: -->
204-
<time>60000</time>
205-
<!-- leverage the healthcheck in the image we use -->
206-
<healthy>yes</healthy>
207-
<!-- In case of any issues with the built-in healthcheck we can revert back to the original log check:-->
208-
<!--<log>DATABASE IS READY TO USE!</log>-->
209-
</wait>
210-
</run>
211-
</image>
212-
</images>
213-
<!--Stops all Oracle DB images currently running, not just those we just started.
214-
Useful to stop processes still running from a previously failed integration test run -->
215-
<allContainers>true</allContainers>
216-
</configuration>
217-
<executions>
218-
<execution>
219-
<id>docker-start</id>
220-
<phase>compile</phase>
221-
<goals>
222-
<goal>stop</goal>
223-
<goal>start</goal>
224-
</goals>
225-
</execution>
226-
<execution>
227-
<id>docker-stop</id>
228-
<phase>post-integration-test</phase>
229-
<goals>
230-
<goal>stop</goal>
231-
</goals>
232-
</execution>
233-
</executions>
234-
</plugin>
235178
<plugin>
236179
<groupId>org.codehaus.mojo</groupId>
237180
<artifactId>exec-maven-plugin</artifactId>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
quarkus.datasource.db-kind=oracle
2-
quarkus.datasource.username=SYSTEM
3-
quarkus.datasource.password=hibernate_orm_test
42

53
# Hibernate config
64
#quarkus.hibernate-orm.log.sql=true
75
quarkus.hibernate-orm.schema-management.strategy=drop-and-create
86

97
# Reactive config
108
quarkus.datasource.reactive=true
11-
quarkus.datasource.reactive.url=${reactive-oracle.url}
12-
139

1410
quarkus.security.users.embedded.enabled=true
1511
quarkus.security.users.embedded.users.scott=jb0ss

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

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
<name>Quarkus - Integration Tests - JPA - Oracle</name>
1414
<description>Module that contains JPA related tests running with the Oracle database</description>
1515

16-
<properties>
17-
<oracledb.url>jdbc:oracle:thin:@localhost:1521/FREEPDB1</oracledb.url>
18-
</properties>
19-
2016
<dependencies>
2117
<!-- Enables the JPA capabilities -->
2218
<dependency>
@@ -188,59 +184,6 @@
188184
</activation>
189185
<build>
190186
<plugins>
191-
<plugin>
192-
<groupId>io.fabric8</groupId>
193-
<artifactId>docker-maven-plugin</artifactId>
194-
<configuration>
195-
<images>
196-
<image>
197-
<name>${oracle.image}</name>
198-
<run>
199-
<ports>
200-
<port>1521:1521</port>
201-
</ports>
202-
<env>
203-
<ORACLE_PASSWORD>hibernate_orm_test</ORACLE_PASSWORD>
204-
</env>
205-
<log>
206-
<prefix>Oracle Database: </prefix>
207-
<date>default</date>
208-
<color>red</color>
209-
</log>
210-
<wait>
211-
<!-- good docs found at: https://dmp.fabric8.io/#build-healthcheck -->
212-
<!-- Unfortunately booting this is slow, needs to set a generous timeout: -->
213-
<time>60000</time>
214-
<!-- leverage the healthcheck in the image we use -->
215-
<healthy>yes</healthy>
216-
<!-- In case of any issues with the built-in healthcheck we can revert back to the original log check:-->
217-
<!--<log>DATABASE IS READY TO USE!</log>-->
218-
</wait>
219-
</run>
220-
</image>
221-
</images>
222-
<!--Stops all Oracle DB images currently running, not just those we just started.
223-
Useful to stop processes still running from a previously failed integration test run -->
224-
<allContainers>true</allContainers>
225-
</configuration>
226-
<executions>
227-
<execution>
228-
<id>docker-start</id>
229-
<phase>compile</phase>
230-
<goals>
231-
<goal>stop</goal>
232-
<goal>start</goal>
233-
</goals>
234-
</execution>
235-
<execution>
236-
<id>docker-stop</id>
237-
<phase>post-integration-test</phase>
238-
<goals>
239-
<goal>stop</goal>
240-
</goals>
241-
</execution>
242-
</executions>
243-
</plugin>
244187
<plugin>
245188
<groupId>org.codehaus.mojo</groupId>
246189
<artifactId>exec-maven-plugin</artifactId>

‎integration-tests/jpa-oracle/src/main/resources/application.properties‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
quarkus.datasource.db-kind=oracle
2-
quarkus.datasource.username=SYSTEM
3-
quarkus.datasource.password=hibernate_orm_test
4-
quarkus.datasource.jdbc.url=${oracledb.url}
52
quarkus.datasource.jdbc.max-size=1
63
quarkus.hibernate-orm.schema-management.strategy=drop-and-create
74
quarkus.datasource.jdbc.additional-jdbc-properties."oracle.jdbc.timezoneAsRegion"=false

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

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
<name>Quarkus - Integration Tests - Reactive Oracle Client</name>
1616

17-
<properties>
18-
<reactive-oracledb.url>vertx-reactive:oracle:thin:@localhost:1521/FREEPDB1</reactive-oracledb.url>
19-
</properties>
20-
2117
<dependencies>
2218
<dependency>
2319
<groupId>io.quarkus</groupId>
@@ -153,59 +149,6 @@
153149
</activation>
154150
<build>
155151
<plugins>
156-
<plugin>
157-
<groupId>io.fabric8</groupId>
158-
<artifactId>docker-maven-plugin</artifactId>
159-
<configuration>
160-
<images>
161-
<image>
162-
<name>${oracle.image}</name>
163-
<run>
164-
<ports>
165-
<port>1521:1521</port>
166-
</ports>
167-
<env>
168-
<ORACLE_PASSWORD>hibernate_orm_test</ORACLE_PASSWORD>
169-
</env>
170-
<log>
171-
<prefix>Oracle Database: </prefix>
172-
<date>default</date>
173-
<color>red</color>
174-
</log>
175-
<wait>
176-
<!-- good docs found at: https://dmp.fabric8.io/#build-healthcheck -->
177-
<!-- Unfortunately booting this is slow, needs to set a generous timeout: -->
178-
<time>60000</time>
179-
<!-- leverage the healthcheck in the image we use -->
180-
<healthy>yes</healthy>
181-
<!-- In case of any issues with the built-in healthcheck we can revert back to the original log check:-->
182-
<!--<log>DATABASE IS READY TO USE!</log>-->
183-
</wait>
184-
</run>
185-
</image>
186-
</images>
187-
<!--Stops all Oracle DB images currently running, not just those we just started.
188-
Useful to stop processes still running from a previously failed integration test run -->
189-
<allContainers>true</allContainers>
190-
</configuration>
191-
<executions>
192-
<execution>
193-
<id>docker-start</id>
194-
<phase>compile</phase>
195-
<goals>
196-
<goal>stop</goal>
197-
<goal>start</goal>
198-
</goals>
199-
</execution>
200-
<execution>
201-
<id>docker-stop</id>
202-
<phase>post-integration-test</phase>
203-
<goals>
204-
<goal>stop</goal>
205-
</goals>
206-
</execution>
207-
</executions>
208-
</plugin>
209152
<plugin>
210153
<groupId>org.codehaus.mojo</groupId>
211154
<artifactId>exec-maven-plugin</artifactId>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
quarkus.datasource.db-kind=oracle
2-
quarkus.datasource.username=SYSTEM
3-
quarkus.datasource.password=hibernate_orm_test
4-
quarkus.datasource.reactive.url=${reactive-oracledb.url}
52
#Uncomment to connect over SSL/TLS
63
#quarkus.datasource.reactive.trust-all=true
74
#quarkus.datasource.reactive.mssql.ssl=true

0 commit comments

Comments
 (0)