You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2021/08/01 13:17:05 UTC
[cassandra-builds] branch trunk updated: Preparation for deleting
branch cassandra-4.0.0
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 f2400a4 Preparation for deleting branch cassandra-4.0.0
f2400a4 is described below
commit f2400a432736f30bcaed1d332db53fe74f69db13
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Sat Jul 31 10:50:33 2021 +0200
Preparation for deleting branch cassandra-4.0.0
patch by Mick Semb Wever; reviewed Brandon Williams for CASSANDRA-16824
---
build-scripts/cassandra-test.sh | 2 +-
jenkins-dsl/cassandra_job_dsl_seed.groovy | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build-scripts/cassandra-test.sh b/build-scripts/cassandra-test.sh
index 0df3292..7756ecd 100755
--- a/build-scripts/cassandra-test.sh
+++ b/build-scripts/cassandra-test.sh
@@ -34,7 +34,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.0.0 trunk; do
+ for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 trunk; do
git checkout $branch
ant realclean
ant jar dtest-jar
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index d97a740..8c69f96 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -55,7 +55,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.0.0', 'trunk']
+def cassandraBranches = ['cassandra-2.2', 'cassandra-3.0', 'cassandra-3.11', 'cassandra-4.0', 'trunk']
if(binding.hasVariable("CASSANDRA_BRANCHES")) {
cassandraBranches = "${CASSANDRA_BRANCHES}".split(",")
}
@@ -380,7 +380,7 @@ cassandraBranches.each {
disabled(false)
using('Cassandra-template-artifacts')
axes {
- if (branchName == 'trunk' || branchName == 'cassandra-4.0.0' || branchName == 'cassandra-4.0') {
+ if (branchName == 'trunk' || branchName == 'cassandra-4.0') {
jdk('jdk_1.8_latest','jdk_11_latest')
} else {
jdk('jdk_1.8_latest')
@@ -455,7 +455,7 @@ cassandraBranches.each {
_testSplits = "/${testSplits}"
}
// jvm-dtest-upgrade would require mixed JDK compilations to support JDK11+
- if ((branchName == 'trunk' || branchName == 'cassandra-4.0.0' || branchName == 'cassandra-4.0') && targetName != 'jvm-dtest-upgrade') {
+ if ((branchName == 'trunk' || branchName == 'cassandra-4.0') && targetName != 'jvm-dtest-upgrade') {
jdk(jdkLabel,'jdk_11_latest')
} else {
jdk(jdkLabel)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org