Skip to content

Commit 50b70f9

Browse files
cpjuliacpjulia
committed
Merge branch 'devel' of github.com:arangodb/arangodb into feature/supervised-aql-value
2 parents 2b28575 + cf3801c commit 50b70f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1755
-3930
lines changed

‎.circleci/base_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ parameters:
3939
rebuild-test-docker-images:
4040
type: boolean
4141
default: false
42-
nightly:
42+
full:
4343
type: boolean
4444
default: false
4545
replication-two:

‎.circleci/config.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ parameters:
2222
enum: ["none", "tsan", "alubsan"]
2323
default: "none"
2424
description: "Sanitizer to use"
25-
nightly:
25+
full:
2626
type: boolean
2727
default: false
28-
description: "Whether this is a nightly build"
28+
description: "Whether to run the full test set (e.g., for nightly builds) or reduced set (e.g., for normal PR builds)"
2929
arangod-without-v8:
3030
type: boolean
3131
default: false
@@ -110,8 +110,6 @@ jobs:
110110
command: |
111111
if [ "<< pipeline.parameters.dont-cancel-pipelines >>" == "true" ]; then
112112
echo "Cancelling of redundant pipelines is disabled, not cancelling any pipelines"
113-
elif [ "<< pipeline.parameters.nightly >>" == "true" ]; then
114-
echo "Nightly build - not cancelling any pipelines"
115113
elif [[ "$CIRCLE_BRANCH" =~ ^[0-9]+\.[0-9]+(\.[0-9]+)$ ]] || [ "$CIRCLE_BRANCH" == "devel" ]; then
116114
echo "Branch is a release branch or devel, not cancelling any pipelines"
117115
else
@@ -163,7 +161,7 @@ jobs:
163161
command: |
164162
echo "enterprise-branch: << pipeline.parameters.enterprise-branch >>"
165163
echo "sanitizer: << pipeline.parameters.sanitizer >>"
166-
echo "nightly: << pipeline.parameters.nightly >>"
164+
echo "full: << pipeline.parameters.full >>"
167165
echo "arangod-without-v8: << pipeline.parameters.arangod-without-v8 >>"
168166
echo "config-definitions: << pipeline.parameters.config-definitions >>"
169167
echo "config-definitions-branches: << pipeline.parameters.config-definitions-branches >>"
@@ -232,8 +230,8 @@ jobs:
232230
--arangosh-args "A<< pipeline.parameters.arangosh_args >>" \
233231
--extra-args "A<< pipeline.parameters.extra_args >>" \
234232
--test-image "<< pipeline.parameters.test-docker-image >>" \
235-
--arangod-without-v8 "<< pipeline.parameters.arangod-without-v8 >>" \
236-
<<# pipeline.parameters.nightly >> --nightly <</ pipeline.parameters.nightly >> \
233+
<<# pipeline.parameters.arangod-without-v8 >> --arangod-without-v8 <</ pipeline.parameters.arangod-without-v8 >>\
234+
<<# pipeline.parameters.full >> --full <</ pipeline.parameters.full >> \
237235
<<# pipeline.parameters.create-docker-images >> --create-docker-images <</ pipeline.parameters.create-docker-images >> \
238236
<<# pipeline.parameters.replication-two >> -rt <</ pipeline.parameters.replication-two >> \
239237
--driver-branch-overrides "<<parameters.config-definitions-branches>>" \

‎.circleci/generate_config.py‎

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,10 @@ def create_generator_config(
142142
test_image: str,
143143
arangosh_args: str,
144144
extra_args: str,
145-
arangod_without_v8: str,
146-
single: bool,
147-
cluster: bool,
145+
arangod_without_v8: bool,
148146
gtest: bool,
149147
full: bool,
150-
all_tests: bool,
151148
replication_two: bool,
152-
nightly: bool,
153149
create_docker_images: bool,
154150
validate_only: bool,
155151
) -> GeneratorConfig:
@@ -169,26 +165,22 @@ def create_generator_config(
169165

170166
# Create filter criteria
171167
filter_criteria = FilterCriteria(
172-
single=single,
173-
cluster=cluster,
174168
gtest=gtest,
175169
full=full,
176-
all_tests=all_tests,
177-
nightly=nightly,
178170
sanitizer=sanitizer_enum,
171+
v8=not arangod_without_v8,
179172
)
180173

181174
# Create test execution config
182175
arangosh_args_list = TestArguments.parse_args_string(arangosh_args or "")
183176
extra_args_list = TestArguments.parse_args_string(
184177
extra_args or "",
185-
add_skip_server_js=(arangod_without_v8 == "true"),
178+
add_skip_server_js=arangod_without_v8,
186179
)
187180

188181
test_execution = TestExecutionConfig(
189182
arangosh_args=arangosh_args_list,
190183
extra_args=extra_args_list,
191-
arangod_without_v8=(arangod_without_v8 == "true"),
192184
replication_two=replication_two,
193185
)
194186

@@ -242,17 +234,8 @@ def create_generator_config(
242234
)
243235
@click.option(
244236
"--arangod-without-v8",
245-
help="Whether to run without JavaScript (true, false)",
246-
)
247-
@click.option(
248-
"--single",
249-
is_flag=True,
250-
help="Include single server tests",
251-
)
252-
@click.option(
253-
"--cluster",
254237
is_flag=True,
255-
help="Include cluster tests",
238+
help="Run without JavaScript (V8 disabled)",
256239
)
257240
@click.option(
258241
"--gtest",
@@ -264,23 +247,12 @@ def create_generator_config(
264247
is_flag=True,
265248
help="Include full test set",
266249
)
267-
@click.option(
268-
"--all",
269-
"all_tests",
270-
is_flag=True,
271-
help="Include all tests, ignore other filters",
272-
)
273250
@click.option(
274251
"-rt",
275252
"--replication-two",
276253
is_flag=True,
277254
help="Enable replication version 2 tests",
278255
)
279-
@click.option(
280-
"--nightly",
281-
is_flag=True,
282-
help="This is a nightly build",
283-
)
284256
@click.option(
285257
"--create-docker-images",
286258
is_flag=True,
@@ -300,14 +272,10 @@ def main(
300272
driver_branch_overrides: str,
301273
arangosh_args: str,
302274
extra_args: str,
303-
arangod_without_v8: str,
304-
single: bool,
305-
cluster: bool,
275+
arangod_without_v8: bool,
306276
gtest: bool,
307277
full: bool,
308-
all_tests: bool,
309278
replication_two: bool,
310-
nightly: bool,
311279
create_docker_images: bool,
312280
validate_only: bool,
313281
):
@@ -335,13 +303,9 @@ def main(
335303
arangosh_args=arangosh_args,
336304
extra_args=extra_args,
337305
arangod_without_v8=arangod_without_v8,
338-
single=single,
339-
cluster=cluster,
340306
gtest=gtest,
341307
full=full,
342-
all_tests=all_tests,
343308
replication_two=replication_two,
344-
nightly=nightly,
345309
create_docker_images=create_docker_images,
346310
validate_only=validate_only,
347311
)

0 commit comments

Comments
 (0)