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 733c72b98ffb8808f9e7b61c0722d6a1d03cc951
Merge: d2d5ce8 efc27d6
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
AuthorDate: Thu Oct 14 12:31:30 2021 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
.circleci/config-2_1.yml | 288 ++++++++++++++++++++++++++++---------------
.circleci/config.yml | 105 ++++++++++++++--
.circleci/config.yml.HIGHRES | 105 ++++++++++++++--
.circleci/config.yml.LOWRES | 105 ++++++++++++++--
.circleci/config.yml.MIDRES | 105 ++++++++++++++--
5 files changed, 566 insertions(+), 142 deletions(-)
diff --cc .circleci/config-2_1.yml
index 2fcfc09,70348fb..42b519a
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@@ -122,106 -122,178 +122,190 @@@ j8_seq_executor: &j8_seq_executo
parallelism: 1 # sequential, single container tests: no parallelism benefits
with_dtests_jobs: &with_dtest_jobs
- jobs:
- - build
- # Java 8 unit tests will be run automatically
- - j8_unit_tests:
- requires:
- - build
- - j8_jvm_dtests:
- requires:
- - build
- # specialized unit tests (all run on request using Java 8)
- - start_utests_long:
- type: approval
- requires:
- - build
- - utests_long:
- requires:
- - start_utests_long
- - start_utests_compression:
- type: approval
- requires:
- - build
- - utests_compression:
- requires:
- - start_utests_compression
- - start_utests_stress:
- type: approval
- requires:
- - build
- - utests_stress:
- requires:
- - start_utests_stress
- - start_j8_dtest_jars_build:
- type: approval
- - j8_dtest_jars_build:
- requires:
- - build
- - start_j8_dtest_jars_build
- - start_jvm_upgrade_dtest:
- type: approval
- - j8_jvm_upgrade_dtests:
- requires:
- - start_jvm_upgrade_dtest
- - j8_dtest_jars_build
- # Java 8 dtests (on request)
- - start_j8_dtests:
- type: approval
- requires:
- - build
- - j8_dtests-with-vnodes:
- requires:
- - start_j8_dtests
- - j8_dtests-no-vnodes:
- requires:
- - start_j8_dtests
- # Java 8 upgrade tests
- - start_upgrade_tests:
- type: approval
- requires:
- - build
- - j8_upgradetests-no-vnodes:
- requires:
- - start_upgrade_tests
- # Java 8 repeated utest (on request)
- - start_j8_repeated_utest:
- type: approval
- - j8_repeated_utest:
- requires:
- - start_j8_repeated_utest
- - build
- # Java 8 repeated dtest (on request)
- - start_j8_repeated_dtest:
- type: approval
- - j8_repeated_dtest:
- requires:
- - start_j8_repeated_dtest
- - build
- # Repeated Python upgrade dtest (on request)
- - start_repeated_upgrade_dtest:
- type: approval
- - repeated_upgrade_dtest:
- requires:
- - start_repeated_upgrade_dtest
- - build
- # Repeated JVM upgrade dtest (on request)
- - start_repeated_jvm_upgrade_dtest:
- type: approval
- - repeated_jvm_upgrade_dtest:
- requires:
- - start_repeated_jvm_upgrade_dtest
- - j8_dtest_jars_build
-
- with_dtest_jobs_only: &with_dtest_jobs_only
- jobs:
- - build
- - j8_dtests-with-vnodes:
- requires:
- - build
- - j8_dtests-no-vnodes:
- requires:
- - build
+ jobs:
+ - start_build:
+ type: approval
+ - build:
+ requires:
+ - start_build
+ # Java 8 unit tests
+ - start_j8_unit_tests:
+ type: approval
+ - j8_unit_tests:
+ requires:
+ - start_j8_unit_tests
+ - build
+ - start_j8_jvm_dtests:
+ type: approval
+ - j8_jvm_dtests:
+ requires:
+ - start_j8_jvm_dtests
+ - build
+ # specialized unit tests (all run using Java 8)
+ - start_utests_long:
+ type: approval
+ - utests_long:
+ requires:
+ - start_utests_long
+ - build
+ - start_utests_compression:
+ type: approval
+ - utests_compression:
+ requires:
+ - start_utests_compression
+ - build
++ - start_utests_stress:
++ type: approval
++ - utests_stress:
++ requires:
++ - start_utests_stress
++ - build
+ - start_j8_dtest_jars_build:
+ type: approval
+ - j8_dtest_jars_build:
+ requires:
- - start_j8_dtest_jars_build
+ - build
++ - start_j8_dtest_jars_build
+ - start_jvm_upgrade_dtest:
+ type: approval
+ - j8_jvm_upgrade_dtests:
+ requires:
+ - start_jvm_upgrade_dtest
+ - j8_dtest_jars_build
+ # Java 8 dtests
+ - start_j8_dtests:
+ type: approval
+ - j8_dtests-with-vnodes:
+ requires:
+ - start_j8_dtests
+ - build
+ - j8_dtests-no-vnodes:
+ requires:
+ - start_j8_dtests
+ - build
+ # Java 8 upgrade tests
+ - start_upgrade_tests:
+ type: approval
+ - j8_upgradetests-no-vnodes:
+ requires:
+ - start_upgrade_tests
+ - build
+ # Java 8 repeated utest
+ - start_j8_repeated_utest:
+ type: approval
+ - j8_repeated_utest:
+ requires:
+ - start_j8_repeated_utest
+ - build
+ # Java 8 repeated dtest
+ - start_j8_repeated_dtest:
+ type: approval
+ - j8_repeated_dtest:
+ requires:
+ - start_j8_repeated_dtest
+ - build
+ # Repeated Python upgrade dtest
+ - start_repeated_upgrade_dtest:
+ type: approval
+ - repeated_upgrade_dtest:
+ requires:
+ - start_repeated_upgrade_dtest
+ - build
+ # Repeated JVM upgrade dtest
+ - start_repeated_jvm_upgrade_dtest:
+ type: approval
+ - repeated_jvm_upgrade_dtest:
+ requires:
+ - start_repeated_jvm_upgrade_dtest
+ - j8_dtest_jars_build
+
+ pre-commit_jobs: &pre-commit_jobs
+ jobs:
+ - start_pre-commit_tests:
+ type: approval
+ - build:
+ requires:
+ - start_pre-commit_tests
- # Java 8 unit tests will be run automatically
++ # Java 8 unit tests
+ - j8_unit_tests:
+ requires:
+ - build
+ - j8_jvm_dtests:
+ requires:
+ - build
+ # specialized unit tests (all run on request using Java 8)
+ - start_utests_long:
+ type: approval
+ - utests_long:
+ requires:
+ - start_utests_long
+ - build
+ - start_utests_compression:
+ type: approval
+ - utests_compression:
+ requires:
+ - start_utests_compression
+ - build
++ - start_utests_stress:
++ type: approval
++ - utests_stress:
++ requires:
++ - start_utests_stress
++ - build
+ - start_j8_dtest_jars_build:
+ type: approval
+ - j8_dtest_jars_build:
+ requires:
- - start_j8_dtest_jars_build
+ - build
++ - start_j8_dtest_jars_build
+ - start_jvm_upgrade_dtest:
+ type: approval
+ - j8_jvm_upgrade_dtests:
+ requires:
+ - start_jvm_upgrade_dtest
+ - j8_dtest_jars_build
+ # Java 8 dtests
+ - j8_dtests-with-vnodes:
+ requires:
+ - build
+ - j8_dtests-no-vnodes:
+ requires:
+ - build
+ # Java 8 upgrade tests (on request)
+ - start_upgrade_tests:
+ type: approval
+ - j8_upgradetests-no-vnodes:
+ requires:
+ - start_upgrade_tests
+ - build
+ # Java 8 repeated utest (on request)
+ - start_j8_repeated_utest:
+ type: approval
+ - j8_repeated_utest:
+ requires:
+ - start_j8_repeated_utest
+ - build
+ # Java 8 repeated dtest (on request)
+ - start_j8_repeated_dtest:
+ type: approval
+ - j8_repeated_dtest:
+ requires:
+ - start_j8_repeated_dtest
+ - build
+ # Repeated Python upgrade dtest (on request)
+ - start_repeated_upgrade_dtest:
+ type: approval
+ - repeated_upgrade_dtest:
+ requires:
+ - start_repeated_upgrade_dtest
+ - build
+ # Repeated JVM upgrade dtest (on request)
+ - start_repeated_jvm_upgrade_dtest:
+ type: approval
+ - repeated_jvm_upgrade_dtest:
+ requires:
+ - start_repeated_jvm_upgrade_dtest
+ - j8_dtest_jars_build
workflows:
version: 2
diff --cc .circleci/config.yml
index ac358a0,92c0a59..f70ff7d
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@@ -1639,15 -1586,7 +1648,13 @@@ workflows
- utests_compression:
requires:
- start_utests_compression
+ - build
+ - start_utests_stress:
+ type: approval
- requires:
- - build
+ - utests_stress:
+ requires:
+ - start_utests_stress
++ - build
- start_j8_dtest_jars_build:
type: approval
- j8_dtest_jars_build:
@@@ -1670,10 -1608,82 +1676,88 @@@
- j8_dtests-no-vnodes:
requires:
- start_j8_dtests
+ - build
- start_upgrade_tests:
type: approval
+ - j8_upgradetests-no-vnodes:
+ requires:
+ - start_upgrade_tests
+ - build
+ - start_j8_repeated_utest:
+ type: approval
+ - j8_repeated_utest:
+ requires:
+ - start_j8_repeated_utest
+ - build
+ - start_j8_repeated_dtest:
+ type: approval
+ - j8_repeated_dtest:
requires:
+ - start_j8_repeated_dtest
- build
+ - start_repeated_upgrade_dtest:
+ type: approval
+ - repeated_upgrade_dtest:
+ requires:
+ - start_repeated_upgrade_dtest
+ - build
+ - start_repeated_jvm_upgrade_dtest:
+ type: approval
+ - repeated_jvm_upgrade_dtest:
+ requires:
+ - start_repeated_jvm_upgrade_dtest
+ - j8_dtest_jars_build
+ pre-commit_tests:
+ jobs:
+ - start_pre-commit_tests:
+ type: approval
+ - build:
+ requires:
+ - start_pre-commit_tests
+ - j8_unit_tests:
+ requires:
+ - build
+ - j8_jvm_dtests:
+ requires:
+ - build
+ - start_utests_long:
+ type: approval
+ - utests_long:
+ requires:
+ - start_utests_long
+ - build
+ - start_utests_compression:
+ type: approval
+ - utests_compression:
+ requires:
+ - start_utests_compression
+ - build
++ - start_utests_stress:
++ type: approval
++ - utests_stress:
++ requires:
++ - start_utests_stress
++ - build
+ - start_j8_dtest_jars_build:
+ type: approval
+ - j8_dtest_jars_build:
+ requires:
- - start_j8_dtest_jars_build
+ - build
++ - start_j8_dtest_jars_build
+ - start_jvm_upgrade_dtest:
+ type: approval
+ - j8_jvm_upgrade_dtests:
+ requires:
+ - start_jvm_upgrade_dtest
+ - j8_dtest_jars_build
+ - j8_dtests-with-vnodes:
+ requires:
+ - build
+ - j8_dtests-no-vnodes:
+ requires:
+ - build
+ - start_upgrade_tests:
+ type: approval
- j8_upgradetests-no-vnodes:
requires:
- start_upgrade_tests
diff --cc .circleci/config.yml.HIGHRES
index 3236478,4702215..992c839
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@@ -1639,15 -1586,7 +1648,13 @@@ workflows
- utests_compression:
requires:
- start_utests_compression
+ - build
+ - start_utests_stress:
+ type: approval
- requires:
- - build
+ - utests_stress:
+ requires:
+ - start_utests_stress
++ - build
- start_j8_dtest_jars_build:
type: approval
- j8_dtest_jars_build:
@@@ -1670,10 -1608,82 +1676,88 @@@
- j8_dtests-no-vnodes:
requires:
- start_j8_dtests
+ - build
- start_upgrade_tests:
type: approval
+ - j8_upgradetests-no-vnodes:
+ requires:
+ - start_upgrade_tests
+ - build
+ - start_j8_repeated_utest:
+ type: approval
+ - j8_repeated_utest:
+ requires:
+ - start_j8_repeated_utest
+ - build
+ - start_j8_repeated_dtest:
+ type: approval
+ - j8_repeated_dtest:
requires:
+ - start_j8_repeated_dtest
- build
+ - start_repeated_upgrade_dtest:
+ type: approval
+ - repeated_upgrade_dtest:
+ requires:
+ - start_repeated_upgrade_dtest
+ - build
+ - start_repeated_jvm_upgrade_dtest:
+ type: approval
+ - repeated_jvm_upgrade_dtest:
+ requires:
+ - start_repeated_jvm_upgrade_dtest
+ - j8_dtest_jars_build
+ pre-commit_tests:
+ jobs:
+ - start_pre-commit_tests:
+ type: approval
+ - build:
+ requires:
+ - start_pre-commit_tests
+ - j8_unit_tests:
+ requires:
+ - build
+ - j8_jvm_dtests:
+ requires:
+ - build
+ - start_utests_long:
+ type: approval
+ - utests_long:
+ requires:
+ - start_utests_long
+ - build
+ - start_utests_compression:
+ type: approval
+ - utests_compression:
+ requires:
+ - start_utests_compression
+ - build
++ - start_utests_stress:
++ type: approval
++ - utests_stress:
++ requires:
++ - start_utests_stress
++ - build
+ - start_j8_dtest_jars_build:
+ type: approval
+ - j8_dtest_jars_build:
+ requires:
- - start_j8_dtest_jars_build
+ - build
++ - start_j8_dtest_jars_build
+ - start_jvm_upgrade_dtest:
+ type: approval
+ - j8_jvm_upgrade_dtests:
+ requires:
+ - start_jvm_upgrade_dtest
+ - j8_dtest_jars_build
+ - j8_dtests-with-vnodes:
+ requires:
+ - build
+ - j8_dtests-no-vnodes:
+ requires:
+ - build
+ - start_upgrade_tests:
+ type: approval
- j8_upgradetests-no-vnodes:
requires:
- start_upgrade_tests
diff --cc .circleci/config.yml.LOWRES
index ac358a0,92c0a59..f70ff7d
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@@ -1639,15 -1586,7 +1648,13 @@@ workflows
- utests_compression:
requires:
- start_utests_compression
+ - build
+ - start_utests_stress:
+ type: approval
- requires:
- - build
+ - utests_stress:
+ requires:
+ - start_utests_stress
++ - build
- start_j8_dtest_jars_build:
type: approval
- j8_dtest_jars_build:
@@@ -1670,10 -1608,82 +1676,88 @@@
- j8_dtests-no-vnodes:
requires:
- start_j8_dtests
+ - build
- start_upgrade_tests:
type: approval
+ - j8_upgradetests-no-vnodes:
+ requires:
+ - start_upgrade_tests
+ - build
+ - start_j8_repeated_utest:
+ type: approval
+ - j8_repeated_utest:
+ requires:
+ - start_j8_repeated_utest
+ - build
+ - start_j8_repeated_dtest:
+ type: approval
+ - j8_repeated_dtest:
requires:
+ - start_j8_repeated_dtest
- build
+ - start_repeated_upgrade_dtest:
+ type: approval
+ - repeated_upgrade_dtest:
+ requires:
+ - start_repeated_upgrade_dtest
+ - build
+ - start_repeated_jvm_upgrade_dtest:
+ type: approval
+ - repeated_jvm_upgrade_dtest:
+ requires:
+ - start_repeated_jvm_upgrade_dtest
+ - j8_dtest_jars_build
+ pre-commit_tests:
+ jobs:
+ - start_pre-commit_tests:
+ type: approval
+ - build:
+ requires:
+ - start_pre-commit_tests
+ - j8_unit_tests:
+ requires:
+ - build
+ - j8_jvm_dtests:
+ requires:
+ - build
+ - start_utests_long:
+ type: approval
+ - utests_long:
+ requires:
+ - start_utests_long
+ - build
+ - start_utests_compression:
+ type: approval
+ - utests_compression:
+ requires:
+ - start_utests_compression
+ - build
++ - start_utests_stress:
++ type: approval
++ - utests_stress:
++ requires:
++ - start_utests_stress
++ - build
+ - start_j8_dtest_jars_build:
+ type: approval
+ - j8_dtest_jars_build:
+ requires:
- - start_j8_dtest_jars_build
+ - build
++ - start_j8_dtest_jars_build
+ - start_jvm_upgrade_dtest:
+ type: approval
+ - j8_jvm_upgrade_dtests:
+ requires:
+ - start_jvm_upgrade_dtest
+ - j8_dtest_jars_build
+ - j8_dtests-with-vnodes:
+ requires:
+ - build
+ - j8_dtests-no-vnodes:
+ requires:
+ - build
+ - start_upgrade_tests:
+ type: approval
- j8_upgradetests-no-vnodes:
requires:
- start_upgrade_tests
diff --cc .circleci/config.yml.MIDRES
index 798ff35,6865856..f6ff556
--- a/.circleci/config.yml.MIDRES
+++ b/.circleci/config.yml.MIDRES
@@@ -1639,15 -1586,7 +1648,13 @@@ workflows
- utests_compression:
requires:
- start_utests_compression
+ - build
+ - start_utests_stress:
+ type: approval
- requires:
- - build
+ - utests_stress:
+ requires:
+ - start_utests_stress
++ - build
- start_j8_dtest_jars_build:
type: approval
- j8_dtest_jars_build:
@@@ -1670,10 -1608,82 +1676,88 @@@
- j8_dtests-no-vnodes:
requires:
- start_j8_dtests
+ - build
- start_upgrade_tests:
type: approval
+ - j8_upgradetests-no-vnodes:
+ requires:
+ - start_upgrade_tests
+ - build
+ - start_j8_repeated_utest:
+ type: approval
+ - j8_repeated_utest:
+ requires:
+ - start_j8_repeated_utest
+ - build
+ - start_j8_repeated_dtest:
+ type: approval
+ - j8_repeated_dtest:
requires:
+ - start_j8_repeated_dtest
- build
+ - start_repeated_upgrade_dtest:
+ type: approval
+ - repeated_upgrade_dtest:
+ requires:
+ - start_repeated_upgrade_dtest
+ - build
+ - start_repeated_jvm_upgrade_dtest:
+ type: approval
+ - repeated_jvm_upgrade_dtest:
+ requires:
+ - start_repeated_jvm_upgrade_dtest
+ - j8_dtest_jars_build
+ pre-commit_tests:
+ jobs:
+ - start_pre-commit_tests:
+ type: approval
+ - build:
+ requires:
+ - start_pre-commit_tests
+ - j8_unit_tests:
+ requires:
+ - build
+ - j8_jvm_dtests:
+ requires:
+ - build
+ - start_utests_long:
+ type: approval
+ - utests_long:
+ requires:
+ - start_utests_long
+ - build
+ - start_utests_compression:
+ type: approval
+ - utests_compression:
+ requires:
+ - start_utests_compression
+ - build
++ - start_utests_stress:
++ type: approval
++ - utests_stress:
++ requires:
++ - start_utests_stress
++ - build
+ - start_j8_dtest_jars_build:
+ type: approval
+ - j8_dtest_jars_build:
+ requires:
- - start_j8_dtest_jars_build
+ - build
++ - start_j8_dtest_jars_build
+ - start_jvm_upgrade_dtest:
+ type: approval
+ - j8_jvm_upgrade_dtests:
+ requires:
+ - start_jvm_upgrade_dtest
+ - j8_dtest_jars_build
+ - j8_dtests-with-vnodes:
+ requires:
+ - build
+ - j8_dtests-no-vnodes:
+ requires:
+ - build
+ - start_upgrade_tests:
+ type: approval
- j8_upgradetests-no-vnodes:
requires:
- start_upgrade_tests
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
