Skip to content

Commit 15c0e8e

Browse files
committed
CI: fíx shaded tests
1 parent 09cf6fa commit 15c0e8e

File tree

1 file changed

+168
-32
lines changed

1 file changed

+168
-32
lines changed

.circleci/config.yml

+168-32
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,39 @@ 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>>
281+
command: mvn verify -am -pl test-non-functional -Dgpg.skip -Dmaven.javadoc.skip
216282
- report:
217-
working_directory: test-functional
283+
working_directory: test-non-functional
284+
- store_cache
285+
286+
# DE-847
287+
# https://issues.apache.org/jira/browse/MSHADE-206
288+
# https://issues.apache.org/jira/browse/MNG-5899
289+
test-non-func-shaded:
290+
executor: 'j21'
291+
steps:
292+
- timeout
293+
- checkout
294+
- setup_remote_docker
295+
- install-sdk:
296+
sdk: 'java'
297+
version: '21.0.2-graalce'
298+
- start-db
299+
- load_cache
300+
- install
301+
- run:
302+
name: mvn dependency:tree
303+
working_directory: test-non-functional
304+
command: mvn dependency:tree -Dshaded
305+
- run:
306+
name: Test
307+
working_directory: test-non-functional
308+
command: mvn verify -Dgpg.skip -Dmaven.javadoc.skip -Dshaded
309+
- report:
310+
working_directory: test-non-functional
218311
- store_cache
219312

220313
sonar:
@@ -266,10 +359,6 @@ jobs:
266359
resilience-test:
267360
executor: 'j21'
268361
resource_class: 'large'
269-
parameters:
270-
shaded:
271-
type: 'string'
272-
default: 'false'
273362
steps:
274363
- timeout
275364
- checkout
@@ -287,10 +376,42 @@ jobs:
287376
TOXIPROXY_VERSION: v2.9.0
288377
- run:
289378
name: mvn dependency:tree
290-
command: mvn dependency:tree -am -pl test-resilience -Dshaded=<<parameters.shaded>>
379+
command: mvn dependency:tree -am -pl test-resilience
291380
- run:
292381
name: Test
293-
command: mvn verify -am -pl test-resilience -Dgpg.skip -Dmaven.javadoc.skip -Dshaded=<<parameters.shaded>>
382+
command: mvn verify -am -pl test-resilience -Dgpg.skip -Dmaven.javadoc.skip
383+
- store_cache
384+
385+
# DE-847
386+
# https://issues.apache.org/jira/browse/MSHADE-206
387+
# https://issues.apache.org/jira/browse/MNG-5899
388+
resilience-test-shaded:
389+
executor: 'j21'
390+
resource_class: 'large'
391+
steps:
392+
- timeout
393+
- checkout
394+
- setup_remote_docker
395+
- start-db:
396+
topology: 'cluster'
397+
compression: 'true'
398+
- load_cache
399+
- install
400+
- run:
401+
name: Start Toxiproxy
402+
command: ./bin/startProxy.sh
403+
working_directory: test-resilience
404+
background: true
405+
environment:
406+
TOXIPROXY_VERSION: v2.9.0
407+
- run:
408+
name: mvn dependency:tree
409+
working_directory: test-resilience
410+
command: mvn dependency:tree -Dshaded
411+
- run:
412+
name: Test
413+
working_directory: test-resilience
414+
command: mvn verify -Dgpg.skip -Dmaven.javadoc.skip -Dshaded
294415
- store_cache
295416

296417
deploy:
@@ -366,12 +487,16 @@ workflows:
366487
not: <<pipeline.parameters.docker-img>>
367488
jobs:
368489
- test:
369-
name: test-shaded=<<matrix.shaded>>-ssl=<<matrix.ssl>>
490+
name: test-ssl=<<matrix.ssl>>
370491
matrix:
371492
parameters:
372-
shaded:
493+
ssl:
373494
- 'true'
374495
- 'false'
496+
- test-shaded:
497+
name: test-shaded-ssl=<<matrix.ssl>>
498+
matrix:
499+
parameters:
375500
ssl:
376501
- 'true'
377502
- 'false'
@@ -409,16 +534,33 @@ workflows:
409534
only:
410535
- main
411536
- test:
412-
name: test-native-shaded=<<matrix.shaded>>-ssl=<<matrix.ssl>>
537+
name: test-native-ssl=<<matrix.ssl>>
413538
matrix:
414539
parameters:
415540
native:
416541
- 'true'
417542
resource_class:
418543
- '2xlarge'
419-
shaded:
544+
ssl:
420545
- 'true'
421546
- 'false'
547+
graalvm-version:
548+
- '22.0.1-graalce'
549+
- '21.0.2-graalce'
550+
filters:
551+
tags:
552+
only: /^v.*/
553+
branches:
554+
only:
555+
- main
556+
- test-shaded:
557+
name: test-native-shaded-ssl=<<matrix.ssl>>
558+
matrix:
559+
parameters:
560+
native:
561+
- 'true'
562+
resource_class:
563+
- '2xlarge'
422564
ssl:
423565
- 'true'
424566
- 'false'
@@ -450,12 +592,9 @@ workflows:
450592
test-non-func:
451593
jobs:
452594
- test-non-func:
453-
name: test-non-func-shaded=<<matrix.shaded>>
454-
matrix:
455-
parameters:
456-
shaded:
457-
- 'true'
458-
- 'false'
595+
name: test-non-func
596+
- test-non-func-shaded:
597+
name: test-non-func-shaded
459598

460599
sonar:
461600
when:
@@ -473,12 +612,9 @@ workflows:
473612
resilience-test:
474613
jobs:
475614
- resilience-test:
476-
name: resilience-test-shaded=<<matrix.shaded>>
477-
matrix:
478-
parameters:
479-
shaded:
480-
- 'true'
481-
- 'false'
615+
name: resilience-test
616+
- resilience-test-shaded:
617+
name: resilience-test-shaded
482618

483619
deploy:
484620
jobs:

0 commit comments

Comments
 (0)