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 2022/11/08 17:54:06 UTC
[cassandra] branch cassandra-3.11 updated (f9b2cd6f3f -> 7b7762826e)
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 f9b2cd6f3f Merge branch 'cassandra-3.0' into cassandra-3.11
new 955231cacf CircleCI: Remove repeated jobs from default LOWRES, MIDRES and HIGHRES files
new 7b7762826e 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.yml.HIGHRES | 104 -------------------------------------------
.circleci/config.yml.LOWRES | 104 -------------------------------------------
.circleci/config.yml.MIDRES | 104 -------------------------------------------
.circleci/generate.sh | 95 ++++++++++++++++++++++-----------------
4 files changed, 54 insertions(+), 353 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 7b7762826e367b2a82ba1e99b12f8f19c583b920
Merge: f9b2cd6f3f 955231cacf
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Tue Nov 8 17:48:29 2022 +0000
Merge branch 'cassandra-3.0' into cassandra-3.11
.circleci/config.yml.HIGHRES | 104 -------------------------------------------
.circleci/config.yml.LOWRES | 104 -------------------------------------------
.circleci/config.yml.MIDRES | 104 -------------------------------------------
.circleci/generate.sh | 95 ++++++++++++++++++++++-----------------
4 files changed, 54 insertions(+), 353 deletions(-)
diff --cc .circleci/config.yml.HIGHRES
index 2f1e95a979,c5f23bd782..5c55e714c8
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@@ -3004,48 -2402,12 +2992,24 @@@ workflows
requires:
- start_utests_long
- build
- - start_utests_long_repeat:
- type: approval
- - utests_long_repeat:
- requires:
- - start_utests_long_repeat
- - build
+ - start_utests_cdc:
+ type: approval
+ - utests_cdc:
+ requires:
+ - start_utests_cdc
+ - build
- - start_utests_cdc_repeat:
- type: approval
- - utests_cdc_repeat:
- requires:
- - start_utests_cdc_repeat
- - build
- start_utests_compression:
type: approval
- utests_compression:
requires:
- start_utests_compression
- build
- - start_utests_compression_repeat:
- type: approval
- - utests_compression_repeat:
- requires:
- - start_utests_compression_repeat
- - build
+ - start_utests_stress:
+ type: approval
+ - utests_stress:
+ requires:
+ - start_utests_stress
+ - build
- - start_utests_stress_repeat:
- type: approval
- - utests_stress_repeat:
- requires:
- - start_utests_stress_repeat
- - build
- start_j8_dtest_jars_build:
type: approval
- j8_dtest_jars_build:
@@@ -3082,30 -2432,12 +3034,12 @@@
requires:
- start_j8_dtests_vnode
- build
- - start_j8_dtests_vnode_repeat:
- type: approval
- - j8_dtests_vnode_repeat:
- requires:
- - start_j8_dtests_vnode_repeat
- - build
- - start_j8_upgrade_dtests:
+ - start_upgrade_dtests:
type: approval
- j8_upgrade_dtests:
requires:
- - start_j8_upgrade_dtests
+ - start_upgrade_dtests
- build
- - start_j8_upgrade_dtests_repeat:
- type: approval
- - j8_upgrade_dtests_repeat:
- requires:
- - start_j8_upgrade_dtests_repeat
- - build
- - start_j8_repeated_ant_test:
- type: approval
- - j8_repeated_ant_test:
- requires:
- - start_j8_repeated_ant_test
- - build
pre-commit_tests:
jobs:
- start_pre-commit_tests:
@@@ -3131,40 -2457,12 +3059,24 @@@
requires:
- start_utests_long
- build
- - utests_long_repeat:
- requires:
- - start_utests_long
- - build
+ - start_utests_cdc:
+ type: approval
+ - utests_cdc:
+ requires:
+ - start_utests_cdc
+ - build
- - utests_cdc_repeat:
- requires:
- - start_utests_cdc
- - build
- start_utests_compression:
type: approval
- utests_compression:
requires:
- start_utests_compression
- build
- - utests_compression_repeat:
- requires:
- - start_utests_compression
- - build
+ - start_utests_stress:
+ type: approval
+ - utests_stress:
+ requires:
+ - start_utests_stress
+ - build
- - utests_stress_repeat:
- requires:
- - start_utests_stress
- - build
- start_jvm_upgrade_dtests:
type: approval
- j8_dtest_jars_build:
@@@ -3183,22 -2478,9 +3092,9 @@@
- j8_dtests_vnode:
requires:
- build
- - j8_dtests_vnode_repeat:
- requires:
- - build
- - start_upgrade_dtests:
+ - start_upgrade_tests:
type: approval
- j8_upgrade_dtests:
requires:
- - start_upgrade_dtests
+ - start_upgrade_tests
- build
- - j8_upgrade_dtests_repeat:
- requires:
- - start_upgrade_tests
- - build
- - j8_repeated_ant_test:
- requires:
- - build
diff --cc .circleci/config.yml.LOWRES
index dbfc0855dd,1141a9c923..30046af3ca
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@@ -3004,48 -2402,12 +2992,24 @@@ workflows
requires:
- start_utests_long
- build
- - start_utests_long_repeat:
- type: approval
- - utests_long_repeat:
- requires:
- - start_utests_long_repeat
- - build
+ - start_utests_cdc:
+ type: approval
+ - utests_cdc:
+ requires:
+ - start_utests_cdc
+ - build
- - start_utests_cdc_repeat:
- type: approval
- - utests_cdc_repeat:
- requires:
- - start_utests_cdc_repeat
- - build
- start_utests_compression:
type: approval
- utests_compression:
requires:
- start_utests_compression
- build
- - start_utests_compression_repeat:
- type: approval
- - utests_compression_repeat:
- requires:
- - start_utests_compression_repeat
- - build
+ - start_utests_stress:
+ type: approval
+ - utests_stress:
+ requires:
+ - start_utests_stress
+ - build
- - start_utests_stress_repeat:
- type: approval
- - utests_stress_repeat:
- requires:
- - start_utests_stress_repeat
- - build
- start_j8_dtest_jars_build:
type: approval
- j8_dtest_jars_build:
@@@ -3082,30 -2432,12 +3034,12 @@@
requires:
- start_j8_dtests_vnode
- build
- - start_j8_dtests_vnode_repeat:
- type: approval
- - j8_dtests_vnode_repeat:
- requires:
- - start_j8_dtests_vnode_repeat
- - build
- - start_j8_upgrade_dtests:
+ - start_upgrade_dtests:
type: approval
- j8_upgrade_dtests:
requires:
- - start_j8_upgrade_dtests
+ - start_upgrade_dtests
- build
- - start_j8_upgrade_dtests_repeat:
- type: approval
- - j8_upgrade_dtests_repeat:
- requires:
- - start_j8_upgrade_dtests_repeat
- - build
- - start_j8_repeated_ant_test:
- type: approval
- - j8_repeated_ant_test:
- requires:
- - start_j8_repeated_ant_test
- - build
pre-commit_tests:
jobs:
- start_pre-commit_tests:
@@@ -3131,40 -2457,12 +3059,24 @@@
requires:
- start_utests_long
- build
- - utests_long_repeat:
- requires:
- - start_utests_long
- - build
+ - start_utests_cdc:
+ type: approval
+ - utests_cdc:
+ requires:
+ - start_utests_cdc
+ - build
- - utests_cdc_repeat:
- requires:
- - start_utests_cdc
- - build
- start_utests_compression:
type: approval
- utests_compression:
requires:
- start_utests_compression
- build
- - utests_compression_repeat:
- requires:
- - start_utests_compression
- - build
+ - start_utests_stress:
+ type: approval
+ - utests_stress:
+ requires:
+ - start_utests_stress
+ - build
- - utests_stress_repeat:
- requires:
- - start_utests_stress
- - build
- start_jvm_upgrade_dtests:
type: approval
- j8_dtest_jars_build:
@@@ -3183,22 -2478,9 +3092,9 @@@
- j8_dtests_vnode:
requires:
- build
- - j8_dtests_vnode_repeat:
- requires:
- - build
- - start_upgrade_dtests:
+ - start_upgrade_tests:
type: approval
- j8_upgrade_dtests:
requires:
- - start_upgrade_dtests
+ - start_upgrade_tests
- build
- - j8_upgrade_dtests_repeat:
- requires:
- - start_upgrade_tests
- - build
- - j8_repeated_ant_test:
- requires:
- - build
diff --cc .circleci/config.yml.MIDRES
index bfee0a19e1,5089a3ceac..3c065199df
--- a/.circleci/config.yml.MIDRES
+++ b/.circleci/config.yml.MIDRES
@@@ -3004,48 -2402,12 +2992,24 @@@ workflows
requires:
- start_utests_long
- build
- - start_utests_long_repeat:
- type: approval
- - utests_long_repeat:
- requires:
- - start_utests_long_repeat
- - build
+ - start_utests_cdc:
+ type: approval
+ - utests_cdc:
+ requires:
+ - start_utests_cdc
+ - build
- - start_utests_cdc_repeat:
- type: approval
- - utests_cdc_repeat:
- requires:
- - start_utests_cdc_repeat
- - build
- start_utests_compression:
type: approval
- utests_compression:
requires:
- start_utests_compression
- build
- - start_utests_compression_repeat:
- type: approval
- - utests_compression_repeat:
- requires:
- - start_utests_compression_repeat
- - build
+ - start_utests_stress:
+ type: approval
+ - utests_stress:
+ requires:
+ - start_utests_stress
+ - build
- - start_utests_stress_repeat:
- type: approval
- - utests_stress_repeat:
- requires:
- - start_utests_stress_repeat
- - build
- start_j8_dtest_jars_build:
type: approval
- j8_dtest_jars_build:
@@@ -3082,30 -2432,12 +3034,12 @@@
requires:
- start_j8_dtests_vnode
- build
- - start_j8_dtests_vnode_repeat:
- type: approval
- - j8_dtests_vnode_repeat:
- requires:
- - start_j8_dtests_vnode_repeat
- - build
- - start_j8_upgrade_dtests:
+ - start_upgrade_dtests:
type: approval
- j8_upgrade_dtests:
requires:
- - start_j8_upgrade_dtests
+ - start_upgrade_dtests
- build
- - start_j8_upgrade_dtests_repeat:
- type: approval
- - j8_upgrade_dtests_repeat:
- requires:
- - start_j8_upgrade_dtests_repeat
- - build
- - start_j8_repeated_ant_test:
- type: approval
- - j8_repeated_ant_test:
- requires:
- - start_j8_repeated_ant_test
- - build
pre-commit_tests:
jobs:
- start_pre-commit_tests:
@@@ -3131,40 -2457,12 +3059,24 @@@
requires:
- start_utests_long
- build
- - utests_long_repeat:
- requires:
- - start_utests_long
- - build
+ - start_utests_cdc:
+ type: approval
+ - utests_cdc:
+ requires:
+ - start_utests_cdc
+ - build
- - utests_cdc_repeat:
- requires:
- - start_utests_cdc
- - build
- start_utests_compression:
type: approval
- utests_compression:
requires:
- start_utests_compression
- build
- - utests_compression_repeat:
- requires:
- - start_utests_compression
- - build
+ - start_utests_stress:
+ type: approval
+ - utests_stress:
+ requires:
+ - start_utests_stress
+ - build
- - utests_stress_repeat:
- requires:
- - start_utests_stress
- - build
- start_jvm_upgrade_dtests:
type: approval
- j8_dtest_jars_build:
@@@ -3183,22 -2478,9 +3092,9 @@@
- j8_dtests_vnode:
requires:
- build
- - j8_dtests_vnode_repeat:
- requires:
- - build
- - start_upgrade_dtests:
+ - start_upgrade_tests:
type: approval
- j8_upgrade_dtests:
requires:
- - start_upgrade_dtests
+ - start_upgrade_tests
- build
- - j8_upgrade_dtests_repeat:
- requires:
- - start_upgrade_tests
- - build
- - j8_repeated_ant_test:
- requires:
- - build
diff --cc .circleci/generate.sh
index 8c877b8e7b,c3a836a97e..79bba91d2f
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@@ -236,47 -232,55 +237,59 @@@ 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 "utests_cdc_repeat"
- delete_job "utests_compression_repeat"
- delete_job "utests_system_keyspace_directory_repeat"
- fi
- if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_LONG=")); then
- delete_job "utests_long_repeat"
- fi
- if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_STRESS=")); then
- delete_job "utests_stress_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" "utests_cdc_repeat"
+ delete_job "$1" "utests_compression_repeat"
+ delete_job "$1" "utests_system_keyspace_directory_repeat"
+ fi
+ if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_LONG=")); then
+ delete_job "$1" "utests_long_repeat"
+ fi
++ if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_STRESS=")); then
++ delete_job "$1" "utests_stress_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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org