You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2021/10/19 10:46:25 UTC
[cassandra] branch cassandra-3.11 updated (5c7603c -> 7e95c92)
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 5c7603c Upgrade to snakeyaml 1.26
new ee6cd06 Use dedicated executors for CircleCI repeated test jobs
new 7e95c92 Merge branch 'cassandra-3.0' into cassandra-3.11
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.circleci/config-2_1.yml | 28 +++++++--
.circleci/config-2_1.yml.high_res.patch | 103 +++++++++++++++++++++++---------
.circleci/config-2_1.yml.mid_res.patch | 45 +++++++++++---
.circleci/config.yml.MIDRES | 6 +-
4 files changed, 138 insertions(+), 44 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 7e95c92d00df83d8333852e37813a871a1aada93
Merge: 5c7603c ee6cd06
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Tue Oct 19 11:41:12 2021 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
.circleci/config-2_1.yml | 28 +++++++--
.circleci/config-2_1.yml.high_res.patch | 103 +++++++++++++++++++++++---------
.circleci/config-2_1.yml.mid_res.patch | 45 +++++++++++---
.circleci/config.yml.MIDRES | 6 +-
4 files changed, 138 insertions(+), 44 deletions(-)
diff --cc .circleci/config-2_1.yml.high_res.patch
index 3c85668,09df2e1..ffe37e2
--- a/.circleci/config-2_1.yml.high_res.patch
+++ b/.circleci/config-2_1.yml.high_res.patch
@@@ -1,28 -1,75 +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
++--- .circleci/config-2_1.yml 2021-10-18 11:17:08.000000000 +0100
+++++ .circleci/config-2_1.yml.HIGHRES 2021-10-18 11:22:50.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 --cc .circleci/config-2_1.yml.mid_res.patch
index c24cebf,bcb47fc..bf1f3f7
--- a/.circleci/config-2_1.yml.mid_res.patch
+++ b/.circleci/config-2_1.yml.mid_res.patch
@@@ -1,8 -1,6 +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
++--- .circleci/config-2_1.yml 2021-10-18 11:17:08.000000000 +0100
+++++ .circleci/config-2_1.yml.MIDRES 2021-10-18 11:20:45.000000000 +0100
+ @@ -101,45 +101,65 @@
executor:
name: java8-executor
#exec_resource_class: xlarge
@@@ -45,9 -43,38 +43,38 @@@
+ 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
+++ exec_resource_class: large
+ + parallelism: 25
+
with_dtests_jobs: &with_dtest_jobs
- @@ -308,7 +324,7 @@ jobs:
- target: testclasslist-compression
+ jobs:
-@@ -415,7 +435,7 @@
- target: testclasslist-compression
++@@ -435,7 +455,7 @@
++ target: stress-test
j8_dtests-with-vnodes:
- <<: *j8_par_executor
@@@ -55,7 -82,7 +82,7 @@@
steps:
- attach_workspace:
at: /home/cassandra
- @@ -322,7 +338,7 @@ jobs:
-@@ -429,7 +449,7 @@
++@@ -449,7 +469,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
j8_dtests-no-vnodes:
@@@ -64,7 -91,7 +91,7 @@@
steps:
- attach_workspace:
at: /home/cassandra
- @@ -336,7 +352,7 @@ jobs:
-@@ -443,7 +463,7 @@
++@@ -463,7 +483,7 @@
pytest_extra_args: '--skip-resource-intensive-tests'
j8_upgradetests-no-vnodes:
diff --cc .circleci/config.yml.MIDRES
index f6ff556,ce2e744..5bfb7f6
--- a/.circleci/config.yml.MIDRES
+++ b/.circleci/config.yml.MIDRES
@@@ -129,7 -129,7 +129,7 @@@ jobs
repeated_jvm_upgrade_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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org