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 4389d5e Add to Jenkins high resource python dtests with novonode
4389d5e is described below
commit 4389d5ed2e45b3f605da9db9582c6078311adb09
Author: David Capwell <[email protected]>
AuthorDate: Wed Oct 21 13:31:31 2020 -0700
Add to Jenkins high resource python dtests with novonode
patch by David Capwell; reviewed by Mick Semb Wever for CASSANDRA-16221
---
build-scripts/cassandra-dtest-pytest.sh | 2 ++
jenkins-dsl/cassandra_job_dsl_seed.groovy | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/build-scripts/cassandra-dtest-pytest.sh
b/build-scripts/cassandra-dtest-pytest.sh
index d985e7d..89eb59b 100755
--- a/build-scripts/cassandra-dtest-pytest.sh
+++ b/build-scripts/cassandra-dtest-pytest.sh
@@ -75,6 +75,8 @@ elif [ "${DTEST_TARGET}" = "dtest-offheap" ]; then
DTEST_ARGS="--use-vnodes --num-tokens=${NUM_TOKENS}
--use-off-heap-memtables --skip-resource-intensive-tests --keep-failed-test-dir"
elif [ "${DTEST_TARGET}" = "dtest-large" ]; then
DTEST_ARGS="--use-vnodes --num-tokens=${NUM_TOKENS}
--only-resource-intensive-tests --keep-failed-test-dir"
+elif [ "${DTEST_TARGET}" = "dtest-large-novnode" ]; then
+ DTEST_ARGS="--only-resource-intensive-tests --keep-failed-test-dir"
elif [ "${DTEST_TARGET}" = "dtest-upgrade" ]; then
DTEST_ARGS="--execute-upgrade-tests-only --upgrade-target-version-only
--upgrade-version-selection all"
else
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 2690ed4..00eec93 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_ANT_TEST_TARGETS")) {
}
// Dtest test targets
-def dtestTargets = ['dtest', 'dtest-novnode', 'dtest-offheap', 'dtest-large',
'dtest-upgrade']
+def dtestTargets = ['dtest', 'dtest-novnode', 'dtest-offheap', 'dtest-large',
'dtest-large-novnode', 'dtest-upgrade']
if(binding.hasVariable("CASSANDRA_DTEST_TEST_TARGETS")) {
dtestTargets = "${CASSANDRA_DTEST_TEST_TARGETS}".split(",")
}
@@ -543,7 +543,7 @@ cassandraBranches.each {
using('Cassandra-template-dtest-matrix')
axes {
List<String> values = new ArrayList<String>()
- if (targetName == 'dtest-large') {
+ if (targetName == 'dtest-large' || targetName ==
'dtest-large-novnode') {
splits = dtestLargeSplits
} else {
splits = dtestSplits
@@ -852,14 +852,14 @@ dtestTargets.each {
}
axes {
List<String> values = new ArrayList<String>()
- if (targetName == 'dtest-large') {
+ if (targetName == 'dtest-large' || targetName ==
'dtest-large-novnode') {
splits = dtestLargeSplits
} else {
splits = dtestSplits
}
(1..splits).each { values << it.toString() }
text('split', values)
- if (targetName == 'dtest-large') {
+ if (targetName == 'dtest-large' || targetName ==
'dtest-large-novnode') {
label('label', largeSlaveLabel)
} else {
label('label', slaveLabel)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
