natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CircleCI: make all java distributed tests run in Medium containers 

patch by Ekaterina Dimitrova; reviewed by Andres de la Pena for CASSANDRA-18503
This commit is contained in:
Ekaterina Dimitrova 2023-08-10 18:03:04 -04:00
parent f86929eae0
commit 430be9d9f6
4 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml.PAID
View File

@ -21,7 +21,7 @@ jobs:
j8_jvm_upgrade_dtests: j8_jvm_upgrade_dtests:
docker: docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: xlarge resource_class: medium
working_directory: ~/ working_directory: ~/
shell: /bin/bash -eo pipefail -l shell: /bin/bash -eo pipefail -l
parallelism: 4 parallelism: 4
@ -1780,7 +1780,7 @@ jobs:
j8_jvm_upgrade_dtests_repeat: j8_jvm_upgrade_dtests_repeat:
docker: docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: large resource_class: medium
working_directory: ~/ working_directory: ~/
shell: /bin/bash -eo pipefail -l shell: /bin/bash -eo pipefail -l
parallelism: 25 parallelism: 25
@ -3194,7 +3194,7 @@ jobs:
j8_jvm_dtests: j8_jvm_dtests:
docker: docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: large resource_class: medium
working_directory: ~/ working_directory: ~/
shell: /bin/bash -eo pipefail -l shell: /bin/bash -eo pipefail -l
parallelism: 10 parallelism: 10

8
.circleci/config_template.yml
View File

@ -143,6 +143,12 @@ j8_small_par_executor: &j8_small_par_executor
#exec_resource_class: xlarge #exec_resource_class: xlarge
parallelism: 1 parallelism: 1
j8_small_parallel_executor: &j8_small_parallel_executor
executor:
name: java8-executor
#exec_resource_class: xlarge
parallelism: 1
j8_small_executor: &j8_small_executor j8_small_executor: &j8_small_executor
executor: executor:
name: java8-executor name: java8-executor
@ -598,7 +604,7 @@ jobs:
classlistprefix: distributed classlistprefix: distributed
j8_jvm_upgrade_dtests: j8_jvm_upgrade_dtests:
<<: *j8_medium_par_executor <<: *j8_small_parallel_executor
steps: steps:
- attach_workspace: - attach_workspace:
at: /home/cassandra at: /home/cassandra

32
.circleci/config_template.yml.PAID.patch
View File

@ -1,6 +1,6 @@
--- config-2_1.yml 2023-02-02 21:03:34.000000000 -0500 --- config_template.yml 2023-08-11 09:41:55.000000000 -0400
+++ config-2_1.yml.MIDRES 2023-02-02 21:04:03.000000000 -0500 +++ config_template.yml.PAID 2023-08-11 09:44:44.000000000 -0400
@@ -134,14 +134,14 @@ @@ -134,20 +134,20 @@
j8_par_executor: &j8_par_executor j8_par_executor: &j8_par_executor
executor: executor:
name: java8-executor name: java8-executor
@ -14,12 +14,20 @@
name: java8-executor name: java8-executor
- #exec_resource_class: xlarge - #exec_resource_class: xlarge
- parallelism: 1 - parallelism: 1
+ exec_resource_class: large + exec_resource_class: medium
+ parallelism: 10 + parallelism: 10
j8_small_parallel_executor: &j8_small_parallel_executor
executor:
name: java8-executor
- #exec_resource_class: xlarge
- parallelism: 1
+ exec_resource_class: medium
+ parallelism: 4
j8_small_executor: &j8_small_executor j8_small_executor: &j8_small_executor
executor: executor:
@@ -152,34 +152,51 @@ @@ -158,34 +158,51 @@
j8_medium_par_executor: &j8_medium_par_executor j8_medium_par_executor: &j8_medium_par_executor
executor: executor:
name: java8-executor name: java8-executor
@ -72,12 +80,12 @@
executor: executor:
name: java8-executor name: java8-executor
- parallelism: 4 - parallelism: 4
+ exec_resource_class: large + exec_resource_class: medium
+ parallelism: 25 + parallelism: 25
separate_jobs: &separate_jobs separate_jobs: &separate_jobs
jobs: jobs:
@@ -647,7 +664,7 @@ @@ -653,7 +670,7 @@
target: stress-test target: stress-test
j8_dtests_vnode: j8_dtests_vnode:
@ -86,7 +94,7 @@
steps: steps:
- attach_workspace: - attach_workspace:
at: /home/cassandra at: /home/cassandra
@@ -661,7 +678,7 @@ @@ -667,7 +684,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests' pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
j8_dtests: j8_dtests:
@ -95,7 +103,7 @@
steps: steps:
- attach_workspace: - attach_workspace:
at: /home/cassandra at: /home/cassandra
@@ -675,7 +692,7 @@ @@ -681,7 +698,7 @@
pytest_extra_args: '--skip-resource-intensive-tests' pytest_extra_args: '--skip-resource-intensive-tests'
j8_dtests_large_vnode: j8_dtests_large_vnode:
@ -104,7 +112,7 @@
steps: steps:
- attach_workspace: - attach_workspace:
at: /home/cassandra at: /home/cassandra
@@ -689,7 +706,7 @@ @@ -695,7 +712,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=32 --only-resource-intensive-tests --force-resource-intensive-tests' pytest_extra_args: '--use-vnodes --num-tokens=32 --only-resource-intensive-tests --force-resource-intensive-tests'
j8_dtests_large: j8_dtests_large:
@ -113,7 +121,7 @@
steps: steps:
- attach_workspace: - attach_workspace:
at: /home/cassandra at: /home/cassandra
@@ -703,7 +720,7 @@ @@ -709,7 +726,7 @@
pytest_extra_args: '--num-tokens=32 --only-resource-intensive-tests --force-resource-intensive-tests' pytest_extra_args: '--num-tokens=32 --only-resource-intensive-tests --force-resource-intensive-tests'
j8_upgrade_dtests: j8_upgrade_dtests:
@ -122,7 +130,7 @@
steps: steps:
- attach_workspace: - attach_workspace:
at: /home/cassandra at: /home/cassandra
@@ -858,7 +875,7 @@ @@ -864,7 +881,7 @@
count: ${REPEATED_UPGRADE_DTESTS_COUNT} count: ${REPEATED_UPGRADE_DTESTS_COUNT}
j8_dtests_offheap: j8_dtests_offheap:

2
.circleci/readme.md
View File

@ -101,7 +101,7 @@ generate.sh -p \
-e REPEATED_LARGE_DTESTS=replace_address_test.py::TestReplaceAddress::test_replace_stopped_node \ -e REPEATED_LARGE_DTESTS=replace_address_test.py::TestReplaceAddress::test_replace_stopped_node \
-e REPEATED_JVM_DTESTS=org.apache.cassandra.distributed.test.PagingTest#testPaging \ -e REPEATED_JVM_DTESTS=org.apache.cassandra.distributed.test.PagingTest#testPaging \
-e REPEATED_UPGRADE_DTESTS=upgrade_tests/cql_tests.py \ -e REPEATED_UPGRADE_DTESTS=upgrade_tests/cql_tests.py \
-e REPEATED_JVM_UPGRADE_DTESTS=org.apache.cassandra.distributed.upgrade.GroupByTest -e REPEATED_JVM_UPGRADE_DTESTS=org.apache.cassandra.distributed.upgrade.PagingTest
``` ```
If you need to repeat a particular set of tests and avoid automatic detection of changed tests If you need to repeat a particular set of tests and avoid automatic detection of changed tests
use the -s command line option. use the -s command line option.