This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/master by this push:
new d3da976 Randomise how the dtests are split.
d3da976 is described below
commit d3da9765359bda88068e91b80cfb23a972830fc8
Author: mck <[email protected]>
AuthorDate: Thu Jul 30 08:01:44 2020 +0200
Randomise how the dtests are split.
First runs showed certain test classes contain unproportionally longer test
methods.
---
build-scripts/cassandra-dtest-pytest.sh | 4 ++--
jenkins-dsl/cassandra_job_dsl_seed.groovy | 11 +++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/build-scripts/cassandra-dtest-pytest.sh
b/build-scripts/cassandra-dtest-pytest.sh
index e099ba4..ce8283e 100755
--- a/build-scripts/cassandra-dtest-pytest.sh
+++ b/build-scripts/cassandra-dtest-pytest.sh
@@ -85,8 +85,8 @@ fi
SPLIT_TESTS=""
if [ "x${DTEST_SPLIT_CHUNK}" != "x" ] ; then
- ./run_dtests.py --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS}
--dtest-print-tests-only --dtest-print-tests-output=${WORKSPACE}/test_list.txt
2>&1 | tee -a ${WORKSPACE}/test_stdout.txt
- SPLIT_TESTS=$(split -n l/${DTEST_SPLIT_CHUNK} ${WORKSPACE}/test_list.txt)
+ ./run_dtests.py --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS}
--dtest-print-tests-only --dtest-print-tests-output=${WORKSPACE}/test_list.txt
2>&1 > ${WORKSPACE}/test_stdout.txt
+ SPLIT_TESTS=$(split -n r/${DTEST_SPLIT_CHUNK} ${WORKSPACE}/test_list.txt)
fi
PYTEST_OPTS="-vv --log-level="INFO" --junit-xml=nosetests.xml
--junit-prefix=${DTEST_TARGET} -s"
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 7976d73..98f8ec8 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -91,6 +91,7 @@ matrixJob('Cassandra-template-artifacts') {
}
properties {
githubProjectUrl(githubRepo)
+ priority(1)
}
scm {
git {
@@ -172,6 +173,7 @@ job('Cassandra-template-test') {
}
properties {
githubProjectUrl(githubRepo)
+ priority(3)
}
scm {
git {
@@ -235,6 +237,7 @@ job('Cassandra-template-dtest') {
}
properties {
githubProjectUrl(githubRepo)
+ priority(5)
}
scm {
git {
@@ -293,6 +296,7 @@ matrixJob('Cassandra-template-dtest-matrix') {
}
properties {
githubProjectUrl(githubRepo)
+ priority(7)
}
scm {
git {
@@ -363,6 +367,7 @@ matrixJob('Cassandra-template-cqlsh-tests') {
childCustomWorkspace('.')
properties {
githubProjectUrl(githubRepo)
+ priority(3)
}
scm {
git {
@@ -543,6 +548,7 @@ cassandraBranches.each {
}
properties {
githubProjectUrl(githubRepo)
+ priority(1)
}
definition {
cpsScm {
@@ -599,6 +605,7 @@ matrixJob('Cassandra-devbranch-artifacts') {
}
properties {
githubProjectUrl(githubRepo)
+ priority(1)
}
scm {
git {
@@ -661,6 +668,7 @@ testTargets.each {
}
properties {
githubProjectUrl(githubRepo)
+ priority(3)
}
scm {
git {
@@ -740,6 +748,7 @@ dtestTargets.each {
}
properties {
githubProjectUrl(githubRepo)
+ priority(5)
}
scm {
git {
@@ -814,6 +823,7 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
childCustomWorkspace('.')
properties {
githubProjectUrl(githubRepo)
+ priority(3)
}
scm {
git {
@@ -872,6 +882,7 @@ pipelineJob('Cassandra-devbranch') {
}
properties {
githubProjectUrl(githubRepo)
+ priority(1)
}
definition {
cps {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
