mirror of https://github.com/apache/cassandra
133 lines
3.7 KiB
Diff
133 lines
3.7 KiB
Diff
--- config-2_1.yml 2023-02-07 19:05:10.000000000 -0500
|
|
+++ config-2_1.yml.MIDRES 2023-02-07 19:17:39.000000000 -0500
|
|
@@ -128,13 +128,15 @@
|
|
executor:
|
|
name: java8-executor
|
|
#exec_resource_class: xlarge
|
|
- parallelism: 4
|
|
+ exec_resource_class: medium
|
|
+ parallelism: 25
|
|
|
|
j8_small_par_executor: &j8_small_par_executor
|
|
executor:
|
|
name: java8-executor
|
|
#exec_resource_class: xlarge
|
|
- parallelism: 1
|
|
+ exec_resource_class: large
|
|
+ parallelism: 10
|
|
|
|
j8_small_executor: &j8_small_executor
|
|
executor:
|
|
@@ -145,34 +147,51 @@
|
|
j8_medium_par_executor: &j8_medium_par_executor
|
|
executor:
|
|
name: java8-executor
|
|
- #exec_resource_class: xlarge
|
|
- parallelism: 1
|
|
+ exec_resource_class: xlarge
|
|
+ parallelism: 4
|
|
+
|
|
+j8_large_par_executor: &j8_large_par_executor
|
|
+ executor:
|
|
+ name: java8-executor
|
|
+ exec_resource_class: large
|
|
+ parallelism: 50
|
|
+
|
|
+j8_very_large_par_executor: &j8_very_large_par_executor
|
|
+ executor:
|
|
+ name: java8-executor
|
|
+ exec_resource_class: large
|
|
+ parallelism: 100
|
|
|
|
j8_seq_executor: &j8_seq_executor
|
|
executor:
|
|
name: java8-executor
|
|
#exec_resource_class: xlarge
|
|
+ exec_resource_class: medium
|
|
parallelism: 1 # sequential, single container tests: no parallelism benefits
|
|
|
|
j8_repeated_utest_executor: &j8_repeated_utest_executor
|
|
executor:
|
|
name: java8-executor
|
|
- parallelism: 4
|
|
+ exec_resource_class: medium
|
|
+ parallelism: 25
|
|
|
|
j8_repeated_dtest_executor: &j8_repeated_dtest_executor
|
|
executor:
|
|
name: java8-executor
|
|
- parallelism: 4
|
|
+ exec_resource_class: large
|
|
+ parallelism: 25
|
|
|
|
j8_repeated_upgrade_dtest_executor: &j8_repeated_upgrade_dtest_executor
|
|
executor:
|
|
name: java8-executor
|
|
- parallelism: 4
|
|
+ exec_resource_class: xlarge
|
|
+ parallelism: 25
|
|
|
|
j8_repeated_jvm_upgrade_dtest_executor: &j8_repeated_jvm_upgrade_dtest_executor
|
|
executor:
|
|
name: java8-executor
|
|
- parallelism: 4
|
|
+ exec_resource_class: medium
|
|
+ parallelism: 25
|
|
|
|
separate_jobs: &separate_jobs
|
|
jobs:
|
|
@@ -551,7 +570,7 @@
|
|
target: testclasslist-compression
|
|
|
|
j8_dtests_vnode:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -565,7 +584,7 @@
|
|
pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
|
|
|
|
j8_dtests:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -579,7 +598,7 @@
|
|
pytest_extra_args: '--skip-resource-intensive-tests'
|
|
|
|
j8_dtests_large_vnode:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_medium_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -593,7 +612,7 @@
|
|
pytest_extra_args: '--use-vnodes --num-tokens=32 --only-resource-intensive-tests --force-resource-intensive-tests'
|
|
|
|
j8_dtests_large:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_medium_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -607,7 +626,7 @@
|
|
pytest_extra_args: '--num-tokens=32 --only-resource-intensive-tests --force-resource-intensive-tests'
|
|
|
|
j8_upgrade_dtests:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_very_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1187,7 +1206,7 @@
|
|
# Put manually specified tests and automatically detected tests together, removing duplicates
|
|
tests=$(echo <<parameters.tests>> | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
|
|
echo "Tests to be repeated: ${tests}"
|
|
-
|
|
+
|
|
# Prepare the testtag for the target, used by the test macro in build.xml to group the output files
|
|
target=<<parameters.target>>
|
|
testtag=""
|