[cassandra-builds] branch master updated: ninja-fix: dtest-large jobs need smaller number of splits (empty splits fail bc no test reports)

2020-08-05 Thread mck 
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 
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 values = new ArrayList()
 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 values = new ArrayList()
-(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: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra-builds] branch master updated: ninja-fix: dtest-large jobs need smaller number of splits (empty splits fail bc no test reports)

2020-08-05 Thread mck 
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 cdfa72a  ninja-fix: dtest-large jobs need smaller number of splits 
(empty splits fail bc no test reports)
cdfa72a is described below

commit cdfa72a892d5048f3590fada007ac5236ea81e8e
Author: mck 
AuthorDate: Wed Aug 5 18:19:51 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 | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy 
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 4047963..fdc53fc 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -70,9 +70,13 @@ if(binding.hasVariable("MAX_JOB_HOURS")) {
 
 // how many splits are dtest jobs matrixed into
 def dtestSplits = 64
+def dtestLargeSplits = 8
 if(binding.hasVariable("DTEST_SPLITS")) {
 dtestSplits = "${DTEST_SPLITS}"
 }
+if(binding.hasVariable("DTEST_LARGE_SPLITS")) {
+dtestLargeSplits = "${DTEST_LARGE_SPLITS}"
+}
 
 
 //
@@ -438,7 +442,11 @@ cassandraBranches.each {
 using('Cassandra-template-dtest-matrix')
 axes {
 List values = new ArrayList()
-(1..dtestSplits).each { values << it.toString() }
+if (targetName == 'dtest-large') {
+(1..dtestLargeSplits).each { values << it.toString() }
+} else {
+(1..dtestSplits).each { values << it.toString() }
+}
 text('split', values)
 label('label', slaveLabel)
 }


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org