Skip to content

Commit 3f15930

Browse files
committed
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
1 parent daadd25 commit 3f15930

6 files changed

Lines changed: 7 additions & 5 deletions

File tree

.build/run-ci

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ def base_job_name(args) -> str:
8282
# TODO: add new version each release branching
8383
if version.startswith("5.0."):
8484
base_job_name._cached_result = "cassandra-5.0"
85+
elif version.startswith("6.0"):
86+
base_job_name._cached_result = "cassandra-6.0"
8587
else:
8688
base_job_name._cached_result = "cassandra"
8789
break

.build/run-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ _build_all_dtest_jars() {
203203
[ "${java_version}" -eq 11 ] && export CASSANDRA_USE_JDK11=true
204204

205205
pushd ${TMP_DIR}/cassandra-dtest-jars >/dev/null
206-
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk ; do
206+
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk ; do
207207
git clean -qxdff && git reset --hard HEAD || echo "failed to reset/clean ${TMP_DIR}/cassandra-dtest-jars… continuing…"
208208
git checkout --quiet $branch
209209
dtest_jar_version=$(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5045,7 +5045,7 @@ jobs:
50455045
cd ~/cassandra
50465046
mkdir ~/dtest_jars
50475047
git remote add apache https://github.com/apache/cassandra.git
5048-
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
5048+
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
50495049
# check out the correct cassandra version:
50505050
git remote set-branches --add apache '$branch'
50515051
git fetch --depth 1 apache $branch

.circleci/config.yml.FREE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5045,7 +5045,7 @@ jobs:
50455045
cd ~/cassandra
50465046
mkdir ~/dtest_jars
50475047
git remote add apache https://github.com/apache/cassandra.git
5048-
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
5048+
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
50495049
# check out the correct cassandra version:
50505050
git remote set-branches --add apache '$branch'
50515051
git fetch --depth 1 apache $branch

.circleci/config.yml.PAID

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5045,7 +5045,7 @@ jobs:
50455045
cd ~/cassandra
50465046
mkdir ~/dtest_jars
50475047
git remote add apache https://github.com/apache/cassandra.git
5048-
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
5048+
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
50495049
# check out the correct cassandra version:
50505050
git remote set-branches --add apache '$branch'
50515051
git fetch --depth 1 apache $branch

.circleci/config_template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2824,7 +2824,7 @@ commands:
28242824
cd ~/cassandra
28252825
mkdir ~/dtest_jars
28262826
git remote add apache https://github.com/apache/cassandra.git
2827-
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
2827+
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
28282828
# check out the correct cassandra version:
28292829
git remote set-branches --add apache '$branch'
28302830
git fetch --depth 1 apache $branch

0 commit comments

Comments
 (0)