mirror of https://github.com/apache/cassandra
Include cassandra-6.0 in build/run-tests.sh and .circleci/config.yml
This is the continuation of CASSANDRA-21319 to make branching of cassandra-6.0 done. The change in .build/run-ci will start to route jobs to cassandra-6.0 pipeline in pre-ci. patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-21319
This commit is contained in:
parent
daadd25fb2
commit
3f1593064c
|
|
@ -82,6 +82,8 @@ def base_job_name(args) -> str:
|
|||
# TODO: add new version each release branching
|
||||
if version.startswith("5.0."):
|
||||
base_job_name._cached_result = "cassandra-5.0"
|
||||
elif version.startswith("6.0"):
|
||||
base_job_name._cached_result = "cassandra-6.0"
|
||||
else:
|
||||
base_job_name._cached_result = "cassandra"
|
||||
break
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ _build_all_dtest_jars() {
|
|||
[ "${java_version}" -eq 11 ] && export CASSANDRA_USE_JDK11=true
|
||||
|
||||
pushd ${TMP_DIR}/cassandra-dtest-jars >/dev/null
|
||||
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk ; do
|
||||
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk ; do
|
||||
git clean -qxdff && git reset --hard HEAD || echo "failed to reset/clean ${TMP_DIR}/cassandra-dtest-jars… continuing…"
|
||||
git checkout --quiet $branch
|
||||
dtest_jar_version=$(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')
|
||||
|
|
|
|||
|
|
@ -5045,7 +5045,7 @@ jobs:
|
|||
cd ~/cassandra
|
||||
mkdir ~/dtest_jars
|
||||
git remote add apache https://github.com/apache/cassandra.git
|
||||
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
|
||||
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
|
||||
# check out the correct cassandra version:
|
||||
git remote set-branches --add apache '$branch'
|
||||
git fetch --depth 1 apache $branch
|
||||
|
|
|
|||
|
|
@ -5045,7 +5045,7 @@ jobs:
|
|||
cd ~/cassandra
|
||||
mkdir ~/dtest_jars
|
||||
git remote add apache https://github.com/apache/cassandra.git
|
||||
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
|
||||
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
|
||||
# check out the correct cassandra version:
|
||||
git remote set-branches --add apache '$branch'
|
||||
git fetch --depth 1 apache $branch
|
||||
|
|
|
|||
|
|
@ -5045,7 +5045,7 @@ jobs:
|
|||
cd ~/cassandra
|
||||
mkdir ~/dtest_jars
|
||||
git remote add apache https://github.com/apache/cassandra.git
|
||||
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
|
||||
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
|
||||
# check out the correct cassandra version:
|
||||
git remote set-branches --add apache '$branch'
|
||||
git fetch --depth 1 apache $branch
|
||||
|
|
|
|||
|
|
@ -2824,7 +2824,7 @@ commands:
|
|||
cd ~/cassandra
|
||||
mkdir ~/dtest_jars
|
||||
git remote add apache https://github.com/apache/cassandra.git
|
||||
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
|
||||
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
|
||||
# check out the correct cassandra version:
|
||||
git remote set-branches --add apache '$branch'
|
||||
git fetch --depth 1 apache $branch
|
||||
|
|
|
|||
Loading…
Reference in New Issue