This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.0 by this push: new ee6cd06 Use dedicated executors for CircleCI repeated test jobs ee6cd06 is described below commit ee6cd06afb66317212d681117d460afebf1ceb31 Author: Andrés de la Peña <a.penya.gar...@gmail.com> AuthorDate: Tue Oct 19 11:39:32 2021 +0100 Use dedicated executors for CircleCI repeated test jobs patch by Andrés de la Peña; reviewed by Ekaterina Dimitrova for CASSANDRA-17043 --- .circleci/config-2_1.yml | 28 +++++++-- .circleci/config-2_1.yml.high_res.patch | 103 +++++++++++++++++++++++--------- .circleci/config-2_1.yml.mid_res.patch | 43 ++++++++++--- .circleci/config.yml.MIDRES | 4 +- 4 files changed, 136 insertions(+), 42 deletions(-) diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml index 70348fb..f287e90 100644 --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@ -121,6 +121,26 @@ j8_seq_executor: &j8_seq_executor #exec_resource_class: xlarge parallelism: 1 # sequential, single container tests: no parallelism benefits +j8_repeated_utest_executor: &j8_repeated_utest_executor + executor: + name: java8-executor + parallelism: 4 + +j8_repeated_dtest_executor: &j8_repeated_dtest_executor + executor: + name: java8-executor + parallelism: 4 + +j8_repeated_upgrade_dtest_executor: &j8_repeated_upgrade_dtest_executor + executor: + name: java8-executor + parallelism: 4 + +j8_repeated_jvm_upgrade_dtest_executor: &j8_repeated_jvm_upgrade_dtest_executor + executor: + name: java8-executor + parallelism: 4 + with_dtests_jobs: &with_dtest_jobs jobs: - start_build: @@ -440,7 +460,7 @@ jobs: pytest_extra_args: '--execute-upgrade-tests' j8_repeated_utest: - <<: *j8_par_executor + <<: *j8_repeated_utest_executor steps: - attach_workspace: at: /home/cassandra @@ -453,7 +473,7 @@ jobs: stop_on_failure: ${REPEATED_UTEST_STOP_ON_FAILURE} j8_repeated_dtest: - <<: *j8_par_executor + <<: *j8_repeated_dtest_executor steps: - attach_workspace: at: /home/cassandra @@ -467,7 +487,7 @@ jobs: stop_on_failure: ${REPEATED_DTEST_STOP_ON_FAILURE} repeated_jvm_upgrade_dtest: - <<: *j8_par_executor + <<: *j8_repeated_jvm_upgrade_dtest_executor steps: - attach_workspace: at: /home/cassandra @@ -480,7 +500,7 @@ jobs: stop_on_failure: ${REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE} repeated_upgrade_dtest: - <<: *j8_par_executor + <<: *j8_repeated_upgrade_dtest_executor steps: - attach_workspace: at: /home/cassandra diff --git a/.circleci/config-2_1.yml.high_res.patch b/.circleci/config-2_1.yml.high_res.patch index 3c85668..09df2e1 100644 --- a/.circleci/config-2_1.yml.high_res.patch +++ b/.circleci/config-2_1.yml.high_res.patch @@ -1,28 +1,75 @@ -17,18c17,18 -< CCM_MAX_HEAP_SIZE: 1024M -< CCM_HEAP_NEWSIZE: 256M ---- -> CCM_MAX_HEAP_SIZE: 2048M -> CCM_HEAP_NEWSIZE: 512M -23,24c23,24 -< #exec_resource_class: xlarge -< parallelism: 4 ---- -> exec_resource_class: xlarge -> parallelism: 100 -29,30c29,30 -< #exec_resource_class: xlarge -< parallelism: 1 ---- -> exec_resource_class: xlarge -> parallelism: 2 -35,36c35,36 -< #exec_resource_class: xlarge -< parallelism: 1 ---- -> exec_resource_class: xlarge -> parallelism: 2 -41c41 -< #exec_resource_class: xlarge ---- -> exec_resource_class: xlarge +--- .circleci/config-2_1.yml 2021-10-19 11:08:44.000000000 +0100 ++++ .circleci/config-2_1.yml.HIGHRES 2021-10-19 11:26:16.000000000 +0100 +@@ -40,8 +40,8 @@ + CASSANDRA_SKIP_SYNC: true + DTEST_REPO: git://github.com/apache/cassandra-dtest.git + DTEST_BRANCH: trunk +- CCM_MAX_HEAP_SIZE: 1024M +- CCM_HEAP_NEWSIZE: 256M ++ CCM_MAX_HEAP_SIZE: 2048M ++ CCM_HEAP_NEWSIZE: 512M + + # The Ant test target to run, for example: + # REPEATED_UTEST_TARGET: testsome +@@ -100,46 +100,50 @@ + j8_par_executor: &j8_par_executor + executor: + name: java8-executor +- #exec_resource_class: xlarge +- parallelism: 4 ++ exec_resource_class: xlarge ++ parallelism: 100 + + j8_small_par_executor: &j8_small_par_executor + executor: + name: java8-executor +- #exec_resource_class: xlarge +- parallelism: 1 ++ exec_resource_class: xlarge ++ parallelism: 2 + + j8_medium_par_executor: &j8_medium_par_executor + executor: + name: java8-executor +- #exec_resource_class: xlarge +- parallelism: 1 ++ exec_resource_class: xlarge ++ parallelism: 2 + + j8_seq_executor: &j8_seq_executor + executor: + name: java8-executor +- #exec_resource_class: xlarge ++ exec_resource_class: xlarge + 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: xlarge ++ parallelism: 100 + + j8_repeated_dtest_executor: &j8_repeated_dtest_executor + executor: + name: java8-executor +- parallelism: 4 ++ exec_resource_class: xlarge ++ parallelism: 100 + + j8_repeated_upgrade_dtest_executor: &j8_repeated_upgrade_dtest_executor + executor: + name: java8-executor +- parallelism: 4 ++ exec_resource_class: xlarge ++ parallelism: 100 + + j8_repeated_jvm_upgrade_dtest_executor: &j8_repeated_jvm_upgrade_dtest_executor + executor: + name: java8-executor +- parallelism: 4 ++ exec_resource_class: xlarge ++ parallelism: 100 + + with_dtests_jobs: &with_dtest_jobs + jobs: diff --git a/.circleci/config-2_1.yml.mid_res.patch b/.circleci/config-2_1.yml.mid_res.patch index c24cebf..bcb47fc 100644 --- a/.circleci/config-2_1.yml.mid_res.patch +++ b/.circleci/config-2_1.yml.mid_res.patch @@ -1,8 +1,6 @@ -diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml -index 03e4ae9e8f..cf2b758187 100644 ---- a/.circleci/config-2_1.yml -+++ b/.circleci/config-2_1.yml -@@ -93,24 +93,40 @@ j8_par_executor: &j8_par_executor +--- .circleci/config-2_1.yml 2021-10-19 11:08:44.000000000 +0100 ++++ .circleci/config-2_1.yml.MIDRES 2021-10-19 11:26:16.000000000 +0100 +@@ -101,45 +101,65 @@ executor: name: java8-executor #exec_resource_class: xlarge @@ -45,8 +43,37 @@ index 03e4ae9e8f..cf2b758187 100644 + 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 + with_dtests_jobs: &with_dtest_jobs -@@ -308,7 +324,7 @@ jobs: + jobs: +@@ -415,7 +435,7 @@ target: testclasslist-compression j8_dtests-with-vnodes: @@ -55,7 +82,7 @@ index 03e4ae9e8f..cf2b758187 100644 steps: - attach_workspace: at: /home/cassandra -@@ -322,7 +338,7 @@ jobs: +@@ -429,7 +449,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests' j8_dtests-no-vnodes: @@ -64,7 +91,7 @@ index 03e4ae9e8f..cf2b758187 100644 steps: - attach_workspace: at: /home/cassandra -@@ -336,7 +352,7 @@ jobs: +@@ -443,7 +463,7 @@ pytest_extra_args: '--skip-resource-intensive-tests' j8_upgradetests-no-vnodes: diff --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES index 6865856..ce2e744 100644 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@ -303,7 +303,7 @@ jobs: repeated_upgrade_dtest: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 25 @@ -423,7 +423,7 @@ jobs: j8_repeated_dtest: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 - resource_class: medium + resource_class: large working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 25 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org