This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new 08c43bf Create release branch cassandra-5.0
08c43bf is described below
commit 08c43bf46135b5ec63e488f22f4737a1c8434eda
Author: Mick Semb Wever <[email protected]>
AuthorDate: Sun Aug 13 20:26:57 2023 +0200
Create release branch cassandra-5.0
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-18705
---
build-scripts/cassandra-test.sh | 2 +-
docker/testing/ubuntu2004_j11_w_dependencies.docker | 20 +++++++++++---------
jenkins-dsl/cassandra_job_dsl_seed.groovy | 4 ++--
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/build-scripts/cassandra-test.sh b/build-scripts/cassandra-test.sh
index bfce947..b67884d 100755
--- a/build-scripts/cassandra-test.sh
+++ b/build-scripts/cassandra-test.sh
@@ -39,7 +39,7 @@ _build_all_dtest_jars() {
cd $TMP_DIR
until git clone --quiet --depth 1 --no-single-branch
https://github.com/apache/cassandra.git cassandra-dtest-jars ; do echo "git
clone failed… trying again… " ; done
cd cassandra-dtest-jars
- for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0
cassandra-4.1 trunk; do
+ for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0
cassandra-4.1 cassandra-5.0 trunk; do
git checkout $branch
if [ "$java_version" -eq 11 ] && ! grep -q "CASSANDRA_USE_JDK11"
build.xml ; then
echo "Skipping dtest-jar jdk11 build of ${branch}."
diff --git a/docker/testing/ubuntu2004_j11_w_dependencies.docker
b/docker/testing/ubuntu2004_j11_w_dependencies.docker
index 5d78a4a..4b51671 100644
--- a/docker/testing/ubuntu2004_j11_w_dependencies.docker
+++ b/docker/testing/ubuntu2004_j11_w_dependencies.docker
@@ -23,6 +23,7 @@ ARG
CASSANDRA_GIT_URL=https://gitbox.apache.org/repos/asf/cassandra.git
RUN git config --global http.postBuffer 524288000
RUN /bin/bash -c "git clone ${CASSANDRA_GIT_URL} ~/cassandra && \
cd ~/cassandra && ant resolver-dist-lib && \
+ git checkout origin/cassandra-5.0 && ant resolver-dist-lib && \
git checkout origin/cassandra-4.1 && ant resolver-dist-lib && \
git checkout origin/cassandra-4.0 && ant resolver-dist-lib && \
git checkout origin/cassandra-3.11 && ant resolver-dist-lib && \
@@ -34,6 +35,7 @@ RUN /bin/bash -c "git clone ${CASSANDRA_GIT_URL} ~/cassandra
&& \
# Initialize the CCM git repo as well as this also can fail to clone
RUN /bin/bash -c "source ~/env3.6/bin/activate && \
ccm create -n 1 -v git:trunk test && ccm remove test && \
+ ccm create -n 1 -v git:cassandra-5.0 test && ccm remove test && \
ccm create -n 1 -v git:cassandra-4.1 test && ccm remove test && \
ccm create -n 1 -v git:cassandra-4.0 test && ccm remove test && \
ccm create -n 1 -v git:cassandra-3.11 test && ccm remove test && \
@@ -41,14 +43,14 @@ RUN /bin/bash -c "source ~/env3.6/bin/activate && \
ccm create -n 1 -v git:cassandra-2.2 test && ccm remove test && \
ccm create -n 1 -v git:cassandra-2.1 test && ccm remove test"
-# Initialize specific versions pulled in for testing
+# Initialize ccm versions. right side of each sequence needs to be updated
with new releases.
+# this can be checked with:
+# `curl -s https://downloads.apache.org/cassandra/ | grep -oP
'(?<=href=\")[0-9]+\.[0-9]+\.[0-9]+(?=)' | sort -V | uniq -w 3`
RUN /bin/bash -c "source ~/env3.6/bin/activate && \
- ccm create -n 1 -v 2.1.14 test && ccm remove test && \
- ccm create -n 1 -v 2.1.22 test && ccm remove test && \
- ccm create -n 1 -v 2.2.19 test && ccm remove test && \
- ccm create -n 1 -v 3.0.17 test && ccm remove test && \
- ccm create -n 1 -v 3.0.27 test && ccm remove test && \
- ccm create -n 1 -v 3.11.3 test && ccm remove test && \
- ccm create -n 1 -v 3.11.13 test && ccm remove test && \
- ccm create -n 1 -v 4.0.4 test && ccm remove test"
+ for i in {1..22} ; do ccm create -n 1 -v 2.1.$i test && ccm remove test ;
done && \
+ for i in {1..19} ; do ccm create -n 1 -v 2.2.$i test && ccm remove test ;
done && \
+ for i in {1..29} ; do ccm create -n 1 -v 3.0.$i test && ccm remove test ;
done && \
+ for i in {1..15} ; do ccm create -n 1 -v 3.11.$i test && ccm remove test ;
done && \
+ for i in {1..11} ; do ccm create -n 1 -v 4.0.$i test && ccm remove test ;
done && \
+ for i in {1..3} ; do ccm create -n 1 -v 4.1.$i test && ccm remove test ;
done"
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 2610e51..1043020 100755
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -50,7 +50,7 @@ if(binding.hasVariable("CASSANDRA_DTEST_GIT_URL")) {
}
def buildDescStr = 'REF = ${GIT_BRANCH} <br /> COMMIT = ${GIT_COMMIT}'
// Cassandra active branches
-def cassandraBranches = ['cassandra-2.2', 'cassandra-3.0', 'cassandra-3.11',
'cassandra-4.0', 'cassandra-4.1', 'trunk']
+def cassandraBranches = ['cassandra-2.2', 'cassandra-3.0', 'cassandra-3.11',
'cassandra-4.0', 'cassandra-4.1', 'cassandra-5.0', 'trunk']
if(binding.hasVariable("CASSANDRA_BRANCHES")) {
cassandraBranches = "${CASSANDRA_BRANCHES}".split(",")
}
@@ -1354,7 +1354,7 @@ job('cassandra-website') {
}
}
triggers {
- upstream('Cassandra-3.11,Cassandra-4.0,Cassandra-4.1,Cassandra-trunk',
'UNSTABLE')
+
upstream('Cassandra-3.11,Cassandra-4.0,Cassandra-4.1,Cassandra-5.0,Cassandra-trunk',
'UNSTABLE')
scm('H/5 * * * *')
}
steps {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
