| --- config-2_1.yml 2022-05-30 12:06:34.000000000 -0400 |
| +++ config-2_1.yml.MIDRES 2022-05-30 12:06:52.000000000 -0400 |
| @@ -105,14 +105,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: |
| @@ -120,29 +120,41 @@ |
| exec_resource_class: medium |
| parallelism: 1 |
| |
| +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_medium_par_executor: &j8_medium_par_executor |
| executor: |
| name: java8-executor |
| - #exec_resource_class: xlarge |
| - parallelism: 1 |
| + exec_resource_class: large |
| + parallelism: 4 |
| |
| 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: |
| @@ -150,35 +162,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: |
| @@ -873,7 +897,7 @@ |
| target: testclasslist-system-keyspace-directory |
| |
| j8_dtests-with-vnodes: |
| - <<: *j8_par_executor |
| + <<: *j8_large_par_executor |
| steps: |
| - attach_workspace: |
| at: /home/cassandra |
| @@ -887,7 +911,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 |
| @@ -902,7 +926,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 |
| @@ -916,7 +940,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 |
| @@ -931,7 +955,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 |
| @@ -945,7 +969,7 @@ |
| pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all' |
| |
| j8_cqlsh-dtests-py3-with-vnodes: |
| - <<: *j8_par_executor |
| + <<: *j8_large_par_executor |
| steps: |
| - attach_workspace: |
| at: /home/cassandra |
| @@ -960,7 +984,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 |
| @@ -978,7 +1002,7 @@ |
| python_version: '3.8' |
| |
| j8_cqlsh-dtests-py3-no-vnodes: |
| - <<: *j8_par_executor |
| + <<: *j8_large_par_executor |
| steps: |
| - attach_workspace: |
| at: /home/cassandra |
| @@ -993,7 +1017,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 |
| @@ -1011,7 +1035,7 @@ |
| python_version: '3.8' |
| |
| j11_cqlsh-dtests-py3-with-vnodes: |
| - <<: *j11_par_executor |
| + <<: *j11_large_par_executor |
| steps: |
| - attach_workspace: |
| at: /home/cassandra |
| @@ -1026,7 +1050,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 |
| @@ -1044,7 +1068,7 @@ |
| python_version: '3.8' |
| |
| j11_cqlsh-dtests-py3-no-vnodes: |
| - <<: *j11_par_executor |
| + <<: *j11_large_par_executor |
| steps: |
| - attach_workspace: |
| at: /home/cassandra |
| @@ -1059,7 +1083,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 |