Skip to content

Commit 30eaf7e

Browse files
authored
[DE-847] fix shaded tests (#568)
* cleaned generated maven metadata of shaded driver * CI: fíx shaded tests
1 parent 202192f commit 30eaf7e

File tree

2 files changed

+170
-33
lines changed

2 files changed

+170
-33
lines changed

Diff for: .circleci/config.yml

+165-33
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ commands:
6969
STARTER_DOCKER_IMAGE: 'docker.io/arangodb/arangodb-starter:0.18.5'
7070
SSL: <<parameters.ssl>>
7171
COMPRESSION: <<parameters.compression>>
72+
install:
73+
steps:
74+
- run:
75+
name: mvn install
76+
command: mvn install -Dmaven.test.skip -Dgpg.skip -Dmaven.javadoc.skip
7277
report:
7378
parameters:
7479
working_directory:
@@ -139,9 +144,6 @@ jobs:
139144
args:
140145
type: 'string'
141146
default: ''
142-
shaded:
143-
type: 'string'
144-
default: 'false'
145147
ssl:
146148
type: 'string'
147149
default: 'false'
@@ -176,27 +178,91 @@ jobs:
176178
name: mvn dependency:tree
177179
command: |
178180
mvn dependency:tree -am -pl test-functional \
179-
-Dshaded=<<parameters.shaded>> \
180181
-Dssl=<<parameters.ssl>> \
181182
-Dnative=<<parameters.native>> \
182183
<<parameters.args>>
183184
- run:
184185
name: Test
185186
command: |
186187
mvn verify -am -pl test-functional -Dgpg.skip -Dmaven.javadoc.skip \
187-
-Dshaded=<<parameters.shaded>> \
188188
-Dssl=<<parameters.ssl>> \
189189
-Dnative=<<parameters.native>> \
190190
<<parameters.args>>
191191
- report:
192192
working_directory: test-functional
193193
- store_cache
194194

195-
test-non-func:
195+
# DE-847
196+
# https://issues.apache.org/jira/browse/MSHADE-206
197+
# https://issues.apache.org/jira/browse/MNG-5899
198+
test-shaded:
196199
parameters:
197-
shaded:
200+
docker-img:
201+
type: 'string'
202+
default: <<pipeline.parameters.docker-img>>
203+
topology:
204+
type: 'string'
205+
default: 'single'
206+
jdk:
207+
type: 'string'
208+
default: 'j21'
209+
args:
210+
type: 'string'
211+
default: ''
212+
ssl:
198213
type: 'string'
199214
default: 'false'
215+
native:
216+
type: 'string'
217+
default: 'false'
218+
graalvm-version:
219+
type: 'string'
220+
default: '21.0.2-graalce'
221+
resource_class:
222+
type: 'string'
223+
default: 'medium'
224+
executor: <<parameters.jdk>>
225+
resource_class: <<parameters.resource_class>>
226+
steps:
227+
- timeout
228+
- checkout
229+
- setup_remote_docker
230+
- when:
231+
condition:
232+
equal: [ 'true', <<parameters.native>> ]
233+
steps:
234+
- install-sdk:
235+
sdk: 'java'
236+
version: <<parameters.graalvm-version>>
237+
- start-db:
238+
docker-img: <<parameters.docker-img>>
239+
topology: <<parameters.topology>>
240+
ssl: <<parameters.ssl>>
241+
- load_cache
242+
- install
243+
- run:
244+
name: mvn dependency:tree
245+
working_directory: test-functional
246+
command: |
247+
mvn dependency:tree \
248+
-Dshaded \
249+
-Dssl=<<parameters.ssl>> \
250+
-Dnative=<<parameters.native>> \
251+
<<parameters.args>>
252+
- run:
253+
name: Test
254+
working_directory: test-functional
255+
command: |
256+
mvn verify -Dgpg.skip \
257+
-Dshaded \
258+
-Dssl=<<parameters.ssl>> \
259+
-Dnative=<<parameters.native>> \
260+
<<parameters.args>>
261+
- report:
262+
working_directory: test-functional
263+
- store_cache
264+
265+
test-non-func:
200266
executor: 'j21'
201267
steps:
202268
- timeout
@@ -209,12 +275,35 @@ jobs:
209275
- load_cache
210276
- run:
211277
name: mvn dependency:tree
212-
command: mvn dependency:tree -am -pl test-non-functional -Dshaded=<<parameters.shaded>>
278+
command: mvn dependency:tree -am -pl test-non-functional
213279
- run:
214280
name: Test
215-
command: mvn verify -am -pl test-non-functional -Dgpg.skip -Dmaven.javadoc.skip -Dshaded=<<parameters.shaded>>
216-
- report:
217-
working_directory: test-functional
281+
command: mvn verify -am -pl test-non-functional -Dgpg.skip -Dmaven.javadoc.skip
282+
- store_cache
283+
284+
# DE-847
285+
# https://issues.apache.org/jira/browse/MSHADE-206
286+
# https://issues.apache.org/jira/browse/MNG-5899
287+
test-non-func-shaded:
288+
executor: 'j21'
289+
steps:
290+
- timeout
291+
- checkout
292+
- setup_remote_docker
293+
- install-sdk:
294+
sdk: 'java'
295+
version: '21.0.2-graalce'
296+
- start-db
297+
- load_cache
298+
- install
299+
- run:
300+
name: mvn dependency:tree
301+
working_directory: test-non-functional
302+
command: mvn dependency:tree -Dshaded
303+
- run:
304+
name: Test
305+
working_directory: test-non-functional
306+
command: mvn verify -Dgpg.skip -Dmaven.javadoc.skip -Dshaded
218307
- store_cache
219308

220309
sonar:
@@ -266,10 +355,6 @@ jobs:
266355
resilience-test:
267356
executor: 'j21'
268357
resource_class: 'large'
269-
parameters:
270-
shaded:
271-
type: 'string'
272-
default: 'false'
273358
steps:
274359
- timeout
275360
- checkout
@@ -287,10 +372,42 @@ jobs:
287372
TOXIPROXY_VERSION: v2.9.0
288373
- run:
289374
name: mvn dependency:tree
290-
command: mvn dependency:tree -am -pl test-resilience -Dshaded=<<parameters.shaded>>
375+
command: mvn dependency:tree -am -pl test-resilience
291376
- run:
292377
name: Test
293-
command: mvn verify -am -pl test-resilience -Dgpg.skip -Dmaven.javadoc.skip -Dshaded=<<parameters.shaded>>
378+
command: mvn verify -am -pl test-resilience -Dgpg.skip -Dmaven.javadoc.skip
379+
- store_cache
380+
381+
# DE-847
382+
# https://issues.apache.org/jira/browse/MSHADE-206
383+
# https://issues.apache.org/jira/browse/MNG-5899
384+
resilience-test-shaded:
385+
executor: 'j21'
386+
resource_class: 'large'
387+
steps:
388+
- timeout
389+
- checkout
390+
- setup_remote_docker
391+
- start-db:
392+
topology: 'cluster'
393+
compression: 'true'
394+
- load_cache
395+
- install
396+
- run:
397+
name: Start Toxiproxy
398+
command: ./bin/startProxy.sh
399+
working_directory: test-resilience
400+
background: true
401+
environment:
402+
TOXIPROXY_VERSION: v2.9.0
403+
- run:
404+
name: mvn dependency:tree
405+
working_directory: test-resilience
406+
command: mvn dependency:tree -Dshaded
407+
- run:
408+
name: Test
409+
working_directory: test-resilience
410+
command: mvn verify -Dgpg.skip -Dmaven.javadoc.skip -Dshaded
294411
- store_cache
295412

296413
deploy:
@@ -366,12 +483,16 @@ workflows:
366483
not: <<pipeline.parameters.docker-img>>
367484
jobs:
368485
- test:
369-
name: test-shaded=<<matrix.shaded>>-ssl=<<matrix.ssl>>
486+
name: test-ssl=<<matrix.ssl>>
370487
matrix:
371488
parameters:
372-
shaded:
489+
ssl:
373490
- 'true'
374491
- 'false'
492+
- test-shaded:
493+
name: test-shaded-ssl=<<matrix.ssl>>
494+
matrix:
495+
parameters:
375496
ssl:
376497
- 'true'
377498
- 'false'
@@ -409,16 +530,33 @@ workflows:
409530
only:
410531
- main
411532
- test:
412-
name: test-native-shaded=<<matrix.shaded>>-ssl=<<matrix.ssl>>
533+
name: test-native-ssl=<<matrix.ssl>>
413534
matrix:
414535
parameters:
415536
native:
416537
- 'true'
417538
resource_class:
418539
- '2xlarge'
419-
shaded:
540+
ssl:
420541
- 'true'
421542
- 'false'
543+
graalvm-version:
544+
- '22.0.1-graalce'
545+
- '21.0.2-graalce'
546+
filters:
547+
tags:
548+
only: /^v.*/
549+
branches:
550+
only:
551+
- main
552+
- test-shaded:
553+
name: test-native-shaded-ssl=<<matrix.ssl>>
554+
matrix:
555+
parameters:
556+
native:
557+
- 'true'
558+
resource_class:
559+
- '2xlarge'
422560
ssl:
423561
- 'true'
424562
- 'false'
@@ -450,12 +588,9 @@ workflows:
450588
test-non-func:
451589
jobs:
452590
- test-non-func:
453-
name: test-non-func-shaded=<<matrix.shaded>>
454-
matrix:
455-
parameters:
456-
shaded:
457-
- 'true'
458-
- 'false'
591+
name: test-non-func
592+
- test-non-func-shaded:
593+
name: test-non-func-shaded
459594

460595
sonar:
461596
when:
@@ -473,12 +608,9 @@ workflows:
473608
resilience-test:
474609
jobs:
475610
- resilience-test:
476-
name: resilience-test-shaded=<<matrix.shaded>>
477-
matrix:
478-
parameters:
479-
shaded:
480-
- 'true'
481-
- 'false'
611+
name: resilience-test
612+
- resilience-test-shaded:
613+
name: resilience-test-shaded
482614

483615
deploy:
484616
jobs:

Diff for: shaded/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@
7474
<goal>shade</goal>
7575
</goals>
7676
<configuration>
77+
<createDependencyReducedPom>true</createDependencyReducedPom>
78+
<useDependencyReducedPomInJar>true</useDependencyReducedPomInJar>
79+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
7780
<createSourcesJar>true</createSourcesJar>
7881
<shadeSourcesContent>true</shadeSourcesContent>
7982
<artifactSet>
@@ -111,13 +114,15 @@
111114
<excludes>
112115
<exclude>META-INF/MANIFEST.MF</exclude>
113116
<exclude>META-INF/services/**</exclude>
117+
<exclude>META-INF/maven/**</exclude>
114118
</excludes>
115119
</filter>
116120
<filter>
117121
<artifact>com.arangodb:http-protocol</artifact>
118122
<excludes>
119123
<exclude>META-INF/MANIFEST.MF</exclude>
120124
<exclude>META-INF/services/**</exclude>
125+
<exclude>META-INF/maven/**</exclude>
121126
</excludes>
122127
</filter>
123128
<filter>

0 commit comments

Comments
 (0)