blob: 43a684651a60e7e3975ebb3342e958fb8f8da2ef [file] [log] [blame]
--- config-2_1.yml 2022-05-30 12:01:09.000000000 -0400
+++ config-2_1.yml.MIDRES 2022-05-30 12:02:51.000000000 -0400
@@ -101,14 +101,14 @@
j8_par_executor: &j8_par_executor
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:
@@ -119,26 +119,38 @@
j8_medium_par_executor: &j8_medium_par_executor
executor:
name: java8-executor
- #exec_resource_class: xlarge
- parallelism: 1
+ exec_resource_class: large
+ 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: xlarge
+ 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
j11_par_executor: &j11_par_executor
executor:
name: java11-executor
- #exec_resource_class: xlarge
- parallelism: 4
+ exec_resource_class: medium
+ parallelism: 25
j11_small_par_executor: &j11_small_par_executor
executor:
name: java11-executor
- #exec_resource_class: xlarge
- parallelism: 1
+ #exec_resource_class: large
+ parallelism: 10
j11_small_executor: &j11_small_executor
executor:
@@ -146,35 +158,47 @@
#exec_resource_class: medium
parallelism: 1
+j11_large_par_executor: &j11_large_par_executor
+ executor:
+ name: java11-executor
+ exec_resource_class: large
+ parallelism: 50
+
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: large
+ parallelism: 25
j11_repeated_utest_executor: &j11_repeated_utest_executor
executor:
name: java11-executor
- parallelism: 4
+ exec_resource_class: medium
+ parallelism: 25
j11_repeated_dtest_executor: &j11_repeated_dtest_executor
executor:
name: java11-executor
- parallelism: 4
+ exec_resource_class: large
+ parallelism: 25
j8_with_dtests_jobs: &j8_with_dtests_jobs
jobs:
@@ -869,7 +893,7 @@
target: testclasslist-system-keyspace-directory
j8_dtests-with-vnodes:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -883,7 +907,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j11_dtests-with-vnodes:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -898,7 +922,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j8_dtests-no-vnodes:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -912,7 +936,7 @@
pytest_extra_args: '--skip-resource-intensive-tests'
j11_dtests-no-vnodes:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -927,7 +951,7 @@
pytest_extra_args: '--skip-resource-intensive-tests'
j8_upgradetests-no-vnodes:
- <<: *j8_par_executor
+ <<: *j8_very_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -941,7 +965,7 @@
pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
j8_cqlsh-dtests-py2-with-vnodes:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -956,7 +980,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j8_cqlsh-dtests-py3-with-vnodes:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -971,7 +995,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh-dtests-py38-with-vnodes:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -989,7 +1013,7 @@
python_version: '3.8'
j8_cqlsh-dtests-py2-no-vnodes:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1004,7 +1028,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j8_cqlsh-dtests-py3-no-vnodes:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1019,7 +1043,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh-dtests-py38-no-vnodes:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1037,7 +1061,7 @@
python_version: '3.8'
j11_cqlsh-dtests-py2-with-vnodes:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1052,7 +1076,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j11_cqlsh-dtests-py3-with-vnodes:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1067,7 +1091,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh-dtests-py38-with-vnodes:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1085,7 +1109,7 @@
python_version: '3.8'
j11_cqlsh-dtests-py2-no-vnodes:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1100,7 +1124,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j11_cqlsh-dtests-py3-no-vnodes:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1115,7 +1139,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh-dtests-py38-no-vnodes:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1757,3 +1781,4 @@
- store_artifacts:
path: ~/cassandra-dtest/logs
destination: dtest_logs
+