From 2480a7e7ee64791acec6add38e134753b95236fd Mon Sep 17 00:00:00 2001 From: Mick Semb Wever Date: Mon, 2 May 2022 17:17:46 +0200 Subject: [PATCH] Update trunk to version 4.2 Update jvm-dtest supported upgrade paths. Update circeci to build 4.1 dtest jar patch by Mick Semb Wever; reviewed by Ekaterina Dimitrova for CASSANDRA-17589 --- .circleci/config-2_1.yml | 2 +- .circleci/config.yml | 2 +- .circleci/config.yml.HIGHRES | 2 +- .circleci/config.yml.LOWRES | 2 +- .circleci/config.yml.MIDRES | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml index d57d7ed39120..21323e9a57a4 100644 --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@ -1228,7 +1228,7 @@ commands: cd ~/cassandra mkdir ~/dtest_jars git remote add apache https://github.com/apache/cassandra.git - for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 trunk; do + for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 cassandra-4.1 trunk; do # check out the correct cassandra version: git remote set-branches --add apache '$branch' git fetch --depth 1 apache $branch diff --git a/.circleci/config.yml b/.circleci/config.yml index be35258a5c65..7e945d19331a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3619,7 +3619,7 @@ jobs: cd ~/cassandra mkdir ~/dtest_jars git remote add apache https://github.com/apache/cassandra.git - for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 trunk; do + for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 cassandra-4.1 trunk; do # check out the correct cassandra version: git remote set-branches --add apache '$branch' git fetch --depth 1 apache $branch diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES index d64c2647e0e3..3696a28340c8 100644 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@ -3619,7 +3619,7 @@ jobs: cd ~/cassandra mkdir ~/dtest_jars git remote add apache https://github.com/apache/cassandra.git - for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 trunk; do + for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 cassandra-4.1 trunk; do # check out the correct cassandra version: git remote set-branches --add apache '$branch' git fetch --depth 1 apache $branch diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES index be35258a5c65..7e945d19331a 100644 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@ -3619,7 +3619,7 @@ jobs: cd ~/cassandra mkdir ~/dtest_jars git remote add apache https://github.com/apache/cassandra.git - for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 trunk; do + for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 cassandra-4.1 trunk; do # check out the correct cassandra version: git remote set-branches --add apache '$branch' git fetch --depth 1 apache $branch diff --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES index 988db3ef1cb0..2f62019162b9 100644 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@ -3619,7 +3619,7 @@ jobs: cd ~/cassandra mkdir ~/dtest_jars git remote add apache https://github.com/apache/cassandra.git - for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 trunk; do + for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 cassandra-4.1 trunk; do # check out the correct cassandra version: git remote set-branches --add apache '$branch' git fetch --depth 1 apache $branch