This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6f431c13a6694173b12c62770b889ad09b9598b4 Merge: a805e32675 cea850d67d Author: Andrés de la Peña <a.penya.gar...@gmail.com> AuthorDate: Tue Nov 8 17:49:50 2022 +0000 Merge branch 'cassandra-4.0' into cassandra-4.1 .circleci/config.yml.HIGHRES | 342 ------------------------------------------- .circleci/config.yml.LOWRES | 342 ------------------------------------------- .circleci/config.yml.MIDRES | 342 ------------------------------------------- .circleci/generate.sh | 121 ++++++++------- 4 files changed, 67 insertions(+), 1080 deletions(-) diff --cc .circleci/config.yml.HIGHRES index 2f411f18da,ea6ae1ead7..33445a7b95 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@@ -6731,36 -8088,6 +6725,18 @@@ workflows requires: - start_j8_jvm_dtests - j8_build + - start_j8_jvm_dtests_vnode: + type: approval + - j8_jvm_dtests_vnode: + requires: + - start_j8_jvm_dtests_vnode + - j8_build - - start_j8_jvm_dtests_repeat: - type: approval - - j8_jvm_dtests_repeat: - requires: - - start_j8_jvm_dtests_repeat - - j8_build - - start_j8_jvm_dtests_vnode_repeat: - type: approval - - j8_jvm_dtests_vnode_repeat: - requires: - - start_j8_jvm_dtests_vnode_repeat - - j8_build + - start_j8_simulator_dtests: + type: approval + - j8_simulator_dtests: + requires: + - start_j8_simulator_dtests + - j8_build - - start_j8_simulator_dtests_repeat: - type: approval - - j8_simulator_dtests_repeat: - requires: - - start_j8_simulator_dtests_repeat - - j8_build - start_j8_cqlshlib_tests: type: approval - j8_cqlshlib_tests: @@@ -7059,27 -8276,9 +6909,15 @@@ - j8_unit_tests: requires: - j8_build - - j8_unit_tests_repeat: - requires: - - j8_build + - j8_simulator_dtests: + requires: + - j8_build - - j8_simulator_dtests_repeat: - requires: - - j8_build - j8_jvm_dtests: requires: - j8_build - - j8_jvm_dtests_repeat: - requires: - - j8_build + - j8_jvm_dtests_vnode: + requires: + - j8_build - - j8_jvm_dtests_vnode_repeat: - requires: - - j8_build - j8_cqlshlib_tests: requires: - j8_build @@@ -7225,23 -8365,13 +7004,13 @@@ - j11_dtests_vnode: requires: - j8_build - - j11_dtests_vnode_repeat: - requires: - - j8_build - - start_upgrade_tests: + - start_upgrade_dtests: type: approval - j8_upgrade_dtests: requires: - j8_build - - start_upgrade_tests - - j8_cqlsh-dtests-py2-with-vnodes: + - start_upgrade_dtests - - j8_upgrade_dtests_repeat: - requires: - - j8_build - - start_upgrade_dtests + - j8_cqlsh_dtests_py3: requires: - j8_build - j8_cqlsh_dtests_py3_vnode: @@@ -7290,24 -8426,6 +7053,12 @@@ requires: - start_j11_jvm_dtests - j11_build + - start_j11_jvm_dtests_vnode: + type: approval + - j11_jvm_dtests_vnode: + requires: + - start_j11_jvm_dtests_vnode + - j11_build - - start_j11_jvm_dtests_repeat: - type: approval - - j11_jvm_dtests_repeat: - requires: - - start_j11_jvm_dtests_repeat - - j11_build - - start_j11_jvm_dtests_vnode_repeat: - type: approval - - j11_jvm_dtests_vnode_repeat: - requires: - - start_j11_jvm_dtests_vnode_repeat - - j11_build - start_j11_cqlshlib_tests: type: approval - j11_cqlshlib_tests: @@@ -7447,19 -8519,10 +7144,10 @@@ - j11_jvm_dtests: requires: - j11_build - - j11_jvm_dtests_repeat: - requires: - - j11_build - - j11_cqlshlib_tests: + - j11_jvm_dtests_vnode: requires: - j11_build - - j11_jvm_dtests_vnode_repeat: - requires: - - j11_build - - j11_jvm_dtests: + - j11_cqlshlib_tests: requires: - j11_build - j11_cqlshlib_tests: @@@ -7471,13 -8534,7 +7159,7 @@@ - j11_dtests_vnode: requires: - j11_build - - j11_dtests_vnode_repeat: - requires: - - j11_build - - j11_cqlsh-dtests-py2-with-vnodes: + - j11_cqlsh_dtests_py3: requires: - j11_build - j11_cqlsh_dtests_py3_vnode: diff --cc .circleci/config.yml.LOWRES index 33923d8e69,ca564102a1..64d2e8f9a9 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@@ -6731,36 -8088,6 +6725,18 @@@ workflows requires: - start_j8_jvm_dtests - j8_build + - start_j8_jvm_dtests_vnode: + type: approval + - j8_jvm_dtests_vnode: + requires: + - start_j8_jvm_dtests_vnode + - j8_build - - start_j8_jvm_dtests_repeat: - type: approval - - j8_jvm_dtests_repeat: - requires: - - start_j8_jvm_dtests_repeat - - j8_build - - start_j8_jvm_dtests_vnode_repeat: - type: approval - - j8_jvm_dtests_vnode_repeat: - requires: - - start_j8_jvm_dtests_vnode_repeat - - j8_build + - start_j8_simulator_dtests: + type: approval + - j8_simulator_dtests: + requires: + - start_j8_simulator_dtests + - j8_build - - start_j8_simulator_dtests_repeat: - type: approval - - j8_simulator_dtests_repeat: - requires: - - start_j8_simulator_dtests_repeat - - j8_build - start_j8_cqlshlib_tests: type: approval - j8_cqlshlib_tests: @@@ -7059,27 -8276,9 +6909,15 @@@ - j8_unit_tests: requires: - j8_build - - j8_unit_tests_repeat: - requires: - - j8_build + - j8_simulator_dtests: + requires: + - j8_build - - j8_simulator_dtests_repeat: - requires: - - j8_build - j8_jvm_dtests: requires: - j8_build - - j8_jvm_dtests_repeat: - requires: - - j8_build + - j8_jvm_dtests_vnode: + requires: + - j8_build - - j8_jvm_dtests_vnode_repeat: - requires: - - j8_build - j8_cqlshlib_tests: requires: - j8_build @@@ -7225,23 -8365,13 +7004,13 @@@ - j11_dtests_vnode: requires: - j8_build - - j11_dtests_vnode_repeat: - requires: - - j8_build - - start_upgrade_tests: + - start_upgrade_dtests: type: approval - j8_upgrade_dtests: requires: - j8_build - - start_upgrade_tests - - j8_cqlsh-dtests-py2-with-vnodes: + - start_upgrade_dtests - - j8_upgrade_dtests_repeat: - requires: - - j8_build - - start_upgrade_dtests + - j8_cqlsh_dtests_py3: requires: - j8_build - j8_cqlsh_dtests_py3_vnode: @@@ -7290,24 -8426,6 +7053,12 @@@ requires: - start_j11_jvm_dtests - j11_build + - start_j11_jvm_dtests_vnode: + type: approval + - j11_jvm_dtests_vnode: + requires: + - start_j11_jvm_dtests_vnode + - j11_build - - start_j11_jvm_dtests_repeat: - type: approval - - j11_jvm_dtests_repeat: - requires: - - start_j11_jvm_dtests_repeat - - j11_build - - start_j11_jvm_dtests_vnode_repeat: - type: approval - - j11_jvm_dtests_vnode_repeat: - requires: - - start_j11_jvm_dtests_vnode_repeat - - j11_build - start_j11_cqlshlib_tests: type: approval - j11_cqlshlib_tests: @@@ -7447,19 -8519,10 +7144,10 @@@ - j11_jvm_dtests: requires: - j11_build - - j11_jvm_dtests_repeat: - requires: - - j11_build - - j11_cqlshlib_tests: + - j11_jvm_dtests_vnode: requires: - j11_build - - j11_jvm_dtests_vnode_repeat: - requires: - - j11_build - - j11_jvm_dtests: + - j11_cqlshlib_tests: requires: - j11_build - j11_cqlshlib_tests: @@@ -7471,13 -8534,7 +7159,7 @@@ - j11_dtests_vnode: requires: - j11_build - - j11_dtests_vnode_repeat: - requires: - - j11_build - - j11_cqlsh-dtests-py2-with-vnodes: + - j11_cqlsh_dtests_py3: requires: - j11_build - j11_cqlsh_dtests_py3_vnode: diff --cc .circleci/config.yml.MIDRES index 50dffc5791,b4c4688b54..a30ec92045 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@@ -6731,36 -8088,6 +6725,18 @@@ workflows requires: - start_j8_jvm_dtests - j8_build + - start_j8_jvm_dtests_vnode: + type: approval + - j8_jvm_dtests_vnode: + requires: + - start_j8_jvm_dtests_vnode + - j8_build - - start_j8_jvm_dtests_repeat: - type: approval - - j8_jvm_dtests_repeat: - requires: - - start_j8_jvm_dtests_repeat - - j8_build - - start_j8_jvm_dtests_vnode_repeat: - type: approval - - j8_jvm_dtests_vnode_repeat: - requires: - - start_j8_jvm_dtests_vnode_repeat - - j8_build + - start_j8_simulator_dtests: + type: approval + - j8_simulator_dtests: + requires: + - start_j8_simulator_dtests + - j8_build - - start_j8_simulator_dtests_repeat: - type: approval - - j8_simulator_dtests_repeat: - requires: - - start_j8_simulator_dtests_repeat - - j8_build - start_j8_cqlshlib_tests: type: approval - j8_cqlshlib_tests: @@@ -7059,27 -8276,9 +6909,15 @@@ - j8_unit_tests: requires: - j8_build - - j8_unit_tests_repeat: - requires: - - j8_build + - j8_simulator_dtests: + requires: + - j8_build - - j8_simulator_dtests_repeat: - requires: - - j8_build - j8_jvm_dtests: requires: - j8_build - - j8_jvm_dtests_repeat: - requires: - - j8_build + - j8_jvm_dtests_vnode: + requires: + - j8_build - - j8_jvm_dtests_vnode_repeat: - requires: - - j8_build - j8_cqlshlib_tests: requires: - j8_build @@@ -7225,23 -8365,13 +7004,13 @@@ - j11_dtests_vnode: requires: - j8_build - - j11_dtests_vnode_repeat: - requires: - - j8_build - - start_upgrade_tests: + - start_upgrade_dtests: type: approval - j8_upgrade_dtests: requires: - j8_build - - start_upgrade_tests - - j8_cqlsh-dtests-py2-with-vnodes: + - start_upgrade_dtests - - j8_upgrade_dtests_repeat: - requires: - - j8_build - - start_upgrade_dtests + - j8_cqlsh_dtests_py3: requires: - j8_build - j8_cqlsh_dtests_py3_vnode: @@@ -7290,24 -8426,6 +7053,12 @@@ requires: - start_j11_jvm_dtests - j11_build + - start_j11_jvm_dtests_vnode: + type: approval + - j11_jvm_dtests_vnode: + requires: + - start_j11_jvm_dtests_vnode + - j11_build - - start_j11_jvm_dtests_repeat: - type: approval - - j11_jvm_dtests_repeat: - requires: - - start_j11_jvm_dtests_repeat - - j11_build - - start_j11_jvm_dtests_vnode_repeat: - type: approval - - j11_jvm_dtests_vnode_repeat: - requires: - - start_j11_jvm_dtests_vnode_repeat - - j11_build - start_j11_cqlshlib_tests: type: approval - j11_cqlshlib_tests: @@@ -7447,19 -8519,10 +7144,10 @@@ - j11_jvm_dtests: requires: - j11_build - - j11_jvm_dtests_repeat: - requires: - - j11_build - - j11_cqlshlib_tests: + - j11_jvm_dtests_vnode: requires: - j11_build - - j11_jvm_dtests_vnode_repeat: - requires: - - j11_build - - j11_jvm_dtests: + - j11_cqlshlib_tests: requires: - j11_build - j11_cqlshlib_tests: @@@ -7471,13 -8534,7 +7159,7 @@@ - j11_dtests_vnode: requires: - j11_build - - j11_dtests_vnode_repeat: - requires: - - j11_build - - j11_cqlsh-dtests-py2-with-vnodes: + - j11_cqlsh_dtests_py3: requires: - j11_build - j11_cqlsh_dtests_py3_vnode: diff --cc .circleci/generate.sh index 09e5baab83,dc570118ca..b42e0ab339 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@@ -248,60 -242,68 +249,72 @@@ delete_job( { delete_yaml_block() { - sed -Ei.bak "/^ - ${1}/,/^ [^[:space:]]+|^ [^[:space:]]+/{//!d;}" $BASEDIR/config.yml - sed -Ei.bak "/^ - ${1}/d" $BASEDIR/config.yml + sed -Ei.bak "/^ - ${2}/,/^ [^[:space:]]+|^ [^[:space:]]+/{//!d;}" "$1" + sed -Ei.bak "/^ - ${2}/d" "$1" } - delete_yaml_block "${1}" - delete_yaml_block "start_${1}" + file="$BASEDIR/$1" + delete_yaml_block "$file" "${2}" + delete_yaml_block "$file" "start_${2}" } - # removed unneeded repeated jobs - if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS=" )); then - delete_job "j8_unit_tests_repeat" - delete_job "j11_unit_tests_repeat" - delete_job "j8_utests_cdc_repeat" - delete_job "j11_utests_cdc_repeat" - delete_job "j8_utests_compression_repeat" - delete_job "j11_utests_compression_repeat" - delete_job "j8_utests_system_keyspace_directory_repeat" - delete_job "j11_utests_system_keyspace_directory_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_LONG=")); then - delete_job "j8_utests_long_repeat" - delete_job "j11_utests_long_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_STRESS=")); then - delete_job "j8_utests_stress_repeat" - delete_job "j11_utests_stress_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_FQLTOOL=")); then - delete_job "j8_utests_fqltool_repeat" - delete_job "j11_utests_fqltool_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_SIMULATOR_DTESTS=")); then - delete_job "j8_simulator_dtests_repeat" - delete_job "j11_simulator_dtests_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_JVM_DTESTS=")); then - delete_job "j8_jvm_dtests_repeat" - delete_job "j8_jvm_dtests_vnode_repeat" - delete_job "j11_jvm_dtests_repeat" - delete_job "j11_jvm_dtests_vnode_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_JVM_UPGRADE_DTESTS=")); then - delete_job "start_jvm_upgrade_dtests_repeat" - delete_job "j8_jvm_upgrade_dtests_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_DTESTS=")); then - delete_job "j8_dtests_repeat" - delete_job "j8_dtests_vnode_repeat" - delete_job "j11_dtests_repeat" - delete_job "j11_dtests_vnode_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_UPGRADE_DTESTS=")); then - delete_job "j8_upgrade_dtests_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_ANT_TEST_CLASS=")); then - delete_job "j8_repeated_ant_test" - delete_job "j11_repeated_ant_test" + # Define function to remove any unneeded repeated jobs. + # The first and only argument is the file name. + delete_repeated_jobs() + { + if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS=" )); then + delete_job "$1" "j8_unit_tests_repeat" + delete_job "$1" "j11_unit_tests_repeat" + delete_job "$1" "j8_utests_cdc_repeat" + delete_job "$1" "j11_utests_cdc_repeat" + delete_job "$1" "j8_utests_compression_repeat" + delete_job "$1" "j11_utests_compression_repeat" + delete_job "$1" "j8_utests_system_keyspace_directory_repeat" + delete_job "$1" "j11_utests_system_keyspace_directory_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_LONG=")); then + delete_job "$1" "j8_utests_long_repeat" + delete_job "$1" "j11_utests_long_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_STRESS=")); then + delete_job "$1" "j8_utests_stress_repeat" + delete_job "$1" "j11_utests_stress_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_FQLTOOL=")); then + delete_job "$1" "j8_utests_fqltool_repeat" + delete_job "$1" "j11_utests_fqltool_repeat" + fi ++ if (! (echo "$env_vars" | grep -q "REPEATED_SIMULATOR_DTESTS=")); then ++ delete_job "$1" "j8_simulator_dtests_repeat" ++ delete_job "$1" "j11_simulator_dtests_repeat" ++ fi + if (! (echo "$env_vars" | grep -q "REPEATED_JVM_DTESTS=")); then + delete_job "$1" "j8_jvm_dtests_repeat" + delete_job "$1" "j8_jvm_dtests_vnode_repeat" + delete_job "$1" "j11_jvm_dtests_repeat" + delete_job "$1" "j11_jvm_dtests_vnode_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_JVM_UPGRADE_DTESTS=")); then + delete_job "$1" "start_jvm_upgrade_dtests_repeat" + delete_job "$1" "j8_jvm_upgrade_dtests_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_DTESTS=")); then + delete_job "$1" "j8_dtests_repeat" + delete_job "$1" "j8_dtests_vnode_repeat" + delete_job "$1" "j11_dtests_repeat" + delete_job "$1" "j11_dtests_vnode_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_UPGRADE_DTESTS=")); then + delete_job "$1" "j8_upgrade_dtests_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_ANT_TEST_CLASS=")); then + delete_job "$1" "j8_repeated_ant_test" + delete_job "$1" "j11_repeated_ant_test" + fi + } + + delete_repeated_jobs "config.yml" + if $all; then + delete_repeated_jobs "config.yml.LOWRES" + delete_repeated_jobs "config.yml.MIDRES" + delete_repeated_jobs "config.yml.HIGHRES" fi --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org