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 5033442 ninja-fix: dtest-large jobs need smaller number of splits
(empty splits fail bc no test reports)
5033442 is described below
commit 50334421d70cbaff1a024db4b7f293a00da46d9c
Author: mck <[email protected]>
AuthorDate: Wed Aug 5 18:52:18 2020 +0200
ninja-fix: dtest-large jobs need smaller number of splits (empty splits
fail bc no test reports)
---
jenkins-dsl/cassandra_job_dsl_seed.groovy | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index fdc53fc..646acb8 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -443,10 +443,11 @@ cassandraBranches.each {
axes {
List<String> values = new ArrayList<String>()
if (targetName == 'dtest-large') {
- (1..dtestLargeSplits).each { values << it.toString() }
+ splits = dtestLargeSplits
} else {
- (1..dtestSplits).each { values << it.toString() }
+ splits = dtestSplits
}
+ (1..splits).each { values << it.toString() }
text('split', values)
label('label', slaveLabel)
}
@@ -454,7 +455,7 @@ cassandraBranches.each {
node / scm / branches / 'hudson.plugins.git.BranchSpec' /
name(branchName)
}
steps {
- shell("sh
./cassandra-builds/docker/jenkins/jenkinscommand.sh apache ${branchName}
https://github.com/apache/cassandra-dtest.git master ${buildsRepo}
${buildsBranch} ${dtestDockerImage} ${targetName} \${split}/${dtestSplits}")
+ shell("sh
./cassandra-builds/docker/jenkins/jenkinscommand.sh apache ${branchName}
https://github.com/apache/cassandra-dtest.git master ${buildsRepo}
${buildsBranch} ${dtestDockerImage} ${targetName} \${split}/${splits}")
}
}
}
@@ -692,7 +693,12 @@ dtestTargets.each {
}
axes {
List<String> values = new ArrayList<String>()
- (1..dtestSplits).each { values << it.toString() }
+ if (targetName == 'dtest-large') {
+ splits = dtestLargeSplits
+ } else {
+ splits = dtestSplits
+ }
+ (1..splits).each { values << it.toString() }
text('split', values)
label('label', slaveLabel)
}
@@ -714,7 +720,7 @@ dtestTargets.each {
steps {
buildDescription('', buildDescStr)
shell("git clean -xdff ; git clone --depth 1 --single-branch -b
${buildsBranch} ${buildsRepo}")
- shell("sh ./cassandra-builds/docker/jenkins/jenkinscommand.sh
\$REPO \$BRANCH \$DTEST_REPO \$DTEST_BRANCH ${buildsRepo} ${buildsBranch}
\$DOCKER_IMAGE ${targetName} \${split}/${dtestSplits}")
+ shell("sh ./cassandra-builds/docker/jenkins/jenkinscommand.sh
\$REPO \$BRANCH \$DTEST_REPO \$DTEST_BRANCH ${buildsRepo} ${buildsBranch}
\$DOCKER_IMAGE ${targetName} \${split}/${splits}")
}
publishers {
archiveArtifacts {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
