Skip to content

Commit e60a026

Browse files
marko-bekhtamarko-bekhta
committed
Use dev services instead of maven docker plugin for Hibernate Search tests
1 parent bed5ce2 commit e60a026

File tree

30 files changed

+8
-1244
lines changed

30 files changed

+8
-1244
lines changed

‎extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml‎

Lines changed: 0 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -96,134 +96,7 @@
9696
</plugin>
9797
<plugin>
9898
<artifactId>maven-surefire-plugin</artifactId>
99-
<configuration>
100-
<skip>true</skip>
101-
</configuration>
10299
</plugin>
103100
</plugins>
104101
</build>
105-
106-
107-
<profiles>
108-
<profile>
109-
<id>test-elasticsearch</id>
110-
<activation>
111-
<property>
112-
<name>test-containers</name>
113-
</property>
114-
</activation>
115-
<build>
116-
<plugins>
117-
<plugin>
118-
<artifactId>maven-surefire-plugin</artifactId>
119-
<configuration>
120-
<skip>false</skip>
121-
</configuration>
122-
</plugin>
123-
</plugins>
124-
</build>
125-
</profile>
126-
127-
<profile>
128-
<id>docker-elasticsearch</id>
129-
<activation>
130-
<property>
131-
<name>start-containers</name>
132-
</property>
133-
</activation>
134-
<properties>
135-
<elasticsearch.hosts>localhost:9200</elasticsearch.hosts>
136-
<elasticsearch.protocol>http</elasticsearch.protocol>
137-
</properties>
138-
<build>
139-
<plugins>
140-
<plugin>
141-
<groupId>io.fabric8</groupId>
142-
<artifactId>docker-maven-plugin</artifactId>
143-
<configuration>
144-
<images>
145-
<image>
146-
<name>${elasticsearch.image}</name>
147-
<alias>elasticsearch</alias>
148-
<run>
149-
<env>
150-
<discovery.type>single-node</discovery.type>
151-
<xpack.security.enabled>false</xpack.security.enabled>
152-
<ES_JAVA_OPTS>-Xms512m -Xmx512m</ES_JAVA_OPTS>
153-
<!-- Disable disk-based shard allocation thresholds:
154-
in a single-node setup they just don't make sense,
155-
and lead to problems on large disks with little space left.
156-
See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation
157-
-->
158-
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
159-
<!-- Disable some features that are not needed in our tests and just slow down startup -->
160-
<xpack.profiling.enabled>false</xpack.profiling.enabled>
161-
<xpack.monitoring.templates.enabled>false</xpack.monitoring.templates.enabled>
162-
<xpack.ml.enabled>false</xpack.ml.enabled>
163-
<xpack.watcher.enabled>false</xpack.watcher.enabled>
164-
<xpack.ent_search.enabled>false</xpack.ent_search.enabled>
165-
<stack.templates.enabled>false</stack.templates.enabled>
166-
<cluster.deprecation_indexing.enabled>false</cluster.deprecation_indexing.enabled>
167-
<indices.lifecycle.history_index_enabled>false</indices.lifecycle.history_index_enabled>
168-
<slm.history_index_enabled>false</slm.history_index_enabled>
169-
</env>
170-
<ports>
171-
<port>9200:9200</port>
172-
</ports>
173-
<log>
174-
<prefix>Elasticsearch: </prefix>
175-
<date>default</date>
176-
<color>cyan</color>
177-
</log>
178-
<wait>
179-
<http>
180-
<url>http://localhost:9200</url>
181-
<method>GET</method>
182-
<status>200</status>
183-
</http>
184-
<time>30000</time>
185-
</wait>
186-
</run>
187-
</image>
188-
</images>
189-
<allContainers>true</allContainers>
190-
</configuration>
191-
<executions>
192-
<execution>
193-
<id>docker-start</id>
194-
<phase>process-test-classes</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>
209-
<plugin>
210-
<groupId>org.codehaus.mojo</groupId>
211-
<artifactId>exec-maven-plugin</artifactId>
212-
<executions>
213-
<execution>
214-
<id>docker-prune</id>
215-
<phase>generate-resources</phase>
216-
<goals>
217-
<goal>exec</goal>
218-
</goals>
219-
<configuration>
220-
<executable>${docker-prune.location}</executable>
221-
</configuration>
222-
</execution>
223-
</executions>
224-
</plugin>
225-
</plugins>
226-
</build>
227-
</profile>
228-
</profiles>
229102
</project>

‎extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui-active-false-and-named-pu-active-true.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ quarkus.hibernate-orm."namedpu".schema-management.strategy=drop-and-create
1818
# Hibernate Search is inactive for the default PU
1919
quarkus.hibernate-search-orm.active=false
2020
quarkus.hibernate-search-orm.elasticsearch.version=9.0
21-
quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
2221
quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
2322

2423
# ... but it's (implicitly) active for a named PU
2524
quarkus.hibernate-search-orm."namedpu".elasticsearch.version=9.0
26-
quarkus.hibernate-search-orm."namedpu".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
2725
quarkus.hibernate-search-orm."namedpu".schema-management.strategy=drop-and-create-and-drop

‎extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui-active-false.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ quarkus.hibernate-orm.schema-management.strategy=drop-and-create
88

99
quarkus.hibernate-search-orm.active=false
1010
quarkus.hibernate-search-orm.elasticsearch.version=9.0
11-
quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
1211
quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop

‎extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
77
quarkus.hibernate-orm.schema-management.strategy=drop-and-create
88

99
quarkus.hibernate-search-orm.elasticsearch.version=9.0
10-
quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
1110
quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop

‎extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-multiple-persistence-units.properties‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,20 @@ quarkus.hibernate-orm.datasource=<default>
1414
quarkus.hibernate-orm.schema-management.strategy=drop-and-create
1515

1616
quarkus.hibernate-search-orm.elasticsearch.version=9
17-
quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
18-
quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
1917
quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
2018
quarkus.hibernate-search-orm.indexing.plan.synchronization.strategy=sync
2119

2220
quarkus.hibernate-orm."pu1".schema-management.strategy=drop-and-create
2321
quarkus.hibernate-orm."pu1".datasource=data1
2422

2523
quarkus.hibernate-search-orm."pu1".elasticsearch.version=9
26-
quarkus.hibernate-search-orm."pu1".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
27-
quarkus.hibernate-search-orm."pu1".elasticsearch.protocol=${elasticsearch.protocol:http}
2824
quarkus.hibernate-search-orm."pu1".schema-management.strategy=drop-and-create-and-drop
2925
quarkus.hibernate-search-orm."pu1".indexing.plan.synchronization.strategy=sync
3026

3127
quarkus.hibernate-orm."pu2".schema-management.strategy=drop-and-create
3228
quarkus.hibernate-orm."pu2".datasource=data2
3329

3430
quarkus.hibernate-search-orm."pu2".elasticsearch.version=9
35-
quarkus.hibernate-search-orm."pu2".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
36-
quarkus.hibernate-search-orm."pu2".elasticsearch.protocol=${elasticsearch.protocol:http}
3731
quarkus.hibernate-search-orm."pu2".schema-management.strategy=drop-and-create-and-drop
3832
quarkus.hibernate-search-orm."pu2".indexing.plan.synchronization.strategy=sync
3933

‎extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ quarkus.hibernate-search-orm.elasticsearch.version=9.0
88
quarkus.hibernate-search-orm.elasticsearch.hosts=localhost:14800
99
quarkus.hibernate-search-orm.schema-management.strategy=none
1010
quarkus.hibernate-search-orm.elasticsearch.version-check.enabled=false
11+
quarkus.elasticsearch.devservices.enabled=false

‎extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
44
quarkus.hibernate-orm.schema-management.strategy=drop-and-create
55

66
quarkus.hibernate-search-orm.elasticsearch.version=9
7-
quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
8-
quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
97
quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
108
quarkus.hibernate-search-orm.indexing.plan.synchronization.strategy=sync

‎extensions/hibernate-search-orm-outbox-polling/deployment/pom.xml‎

Lines changed: 0 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -74,133 +74,7 @@
7474
</plugin>
7575
<plugin>
7676
<artifactId>maven-surefire-plugin</artifactId>
77-
<configuration>
78-
<skip>true</skip>
79-
</configuration>
8077
</plugin>
8178
</plugins>
8279
</build>
83-
84-
<profiles>
85-
<profile>
86-
<id>test-elasticsearch</id>
87-
<activation>
88-
<property>
89-
<name>test-containers</name>
90-
</property>
91-
</activation>
92-
<build>
93-
<plugins>
94-
<plugin>
95-
<artifactId>maven-surefire-plugin</artifactId>
96-
<configuration>
97-
<skip>false</skip>
98-
</configuration>
99-
</plugin>
100-
</plugins>
101-
</build>
102-
</profile>
103-
104-
<profile>
105-
<id>docker-elasticsearch</id>
106-
<activation>
107-
<property>
108-
<name>start-containers</name>
109-
</property>
110-
</activation>
111-
<properties>
112-
<elasticsearch.hosts>localhost:9200</elasticsearch.hosts>
113-
<elasticsearch.protocol>http</elasticsearch.protocol>
114-
</properties>
115-
<build>
116-
<plugins>
117-
<plugin>
118-
<groupId>io.fabric8</groupId>
119-
<artifactId>docker-maven-plugin</artifactId>
120-
<configuration>
121-
<images>
122-
<image>
123-
<name>${elasticsearch.image}</name>
124-
<alias>elasticsearch</alias>
125-
<run>
126-
<env>
127-
<discovery.type>single-node</discovery.type>
128-
<xpack.security.enabled>false</xpack.security.enabled>
129-
<ES_JAVA_OPTS>-Xms512m -Xmx512m</ES_JAVA_OPTS>
130-
<!-- Disable disk-based shard allocation thresholds:
131-
in a single-node setup they just don't make sense,
132-
and lead to problems on large disks with little space left.
133-
See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation
134-
-->
135-
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
136-
<!-- Disable some features that are not needed in our tests and just slow down startup -->
137-
<xpack.profiling.enabled>false</xpack.profiling.enabled>
138-
<xpack.monitoring.templates.enabled>false</xpack.monitoring.templates.enabled>
139-
<xpack.ml.enabled>false</xpack.ml.enabled>
140-
<xpack.watcher.enabled>false</xpack.watcher.enabled>
141-
<xpack.ent_search.enabled>false</xpack.ent_search.enabled>
142-
<stack.templates.enabled>false</stack.templates.enabled>
143-
<cluster.deprecation_indexing.enabled>false</cluster.deprecation_indexing.enabled>
144-
<indices.lifecycle.history_index_enabled>false</indices.lifecycle.history_index_enabled>
145-
<slm.history_index_enabled>false</slm.history_index_enabled>
146-
</env>
147-
<ports>
148-
<port>9200:9200</port>
149-
</ports>
150-
<log>
151-
<prefix>Elasticsearch: </prefix>
152-
<date>default</date>
153-
<color>cyan</color>
154-
</log>
155-
<wait>
156-
<http>
157-
<url>http://localhost:9200</url>
158-
<method>GET</method>
159-
<status>200</status>
160-
</http>
161-
<time>30000</time>
162-
</wait>
163-
</run>
164-
</image>
165-
</images>
166-
<allContainers>true</allContainers>
167-
</configuration>
168-
<executions>
169-
<execution>
170-
<id>docker-start</id>
171-
<phase>process-test-classes</phase>
172-
<goals>
173-
<goal>stop</goal>
174-
<goal>start</goal>
175-
</goals>
176-
</execution>
177-
<execution>
178-
<id>docker-stop</id>
179-
<phase>post-integration-test</phase>
180-
<goals>
181-
<goal>stop</goal>
182-
</goals>
183-
</execution>
184-
</executions>
185-
</plugin>
186-
<plugin>
187-
<groupId>org.codehaus.mojo</groupId>
188-
<artifactId>exec-maven-plugin</artifactId>
189-
<executions>
190-
<execution>
191-
<id>docker-prune</id>
192-
<phase>generate-resources</phase>
193-
<goals>
194-
<goal>exec</goal>
195-
</goals>
196-
<configuration>
197-
<executable>${docker-prune.location}</executable>
198-
</configuration>
199-
</execution>
200-
</executions>
201-
</plugin>
202-
</plugins>
203-
</build>
204-
</profile>
205-
</profiles>
20680
</project>

‎extensions/hibernate-search-orm-outbox-polling/deployment/src/test/resources/application-multiple-persistence-units.properties‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@ quarkus.hibernate-orm.schema-management.strategy=drop-and-create
88
quarkus.hibernate-orm.datasource=<default>
99

1010
quarkus.hibernate-search-orm.elasticsearch.version=9
11-
quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
12-
quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
1311
quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
1412
quarkus.hibernate-search-orm.coordination.strategy=outbox-polling
1513

1614
quarkus.hibernate-orm."pu1".schema-management.strategy=drop-and-create
1715
quarkus.hibernate-orm."pu1".datasource=data1
1816

1917
quarkus.hibernate-search-orm."pu1".elasticsearch.version=9
20-
quarkus.hibernate-search-orm."pu1".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
21-
quarkus.hibernate-search-orm."pu1".elasticsearch.protocol=${elasticsearch.protocol:http}
2218
quarkus.hibernate-search-orm."pu1".schema-management.strategy=drop-and-create-and-drop
2319
quarkus.hibernate-search-orm."pu1".coordination.strategy=outbox-polling

‎extensions/hibernate-search-orm-outbox-polling/deployment/src/test/resources/application.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
44
quarkus.hibernate-orm.schema-management.strategy=drop-and-create
55

66
quarkus.hibernate-search-orm.elasticsearch.version=9
7-
quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
8-
quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
97
quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
108
quarkus.hibernate-search-orm.coordination.strategy=outbox-polling

0 commit comments

Comments
 (0)