[cassandra-builds] branch trunk updated: In Jenkins, introduce the "cassandra-dtest" label

[mc...@apache.org]

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 3ec2a6f  In Jenkins, introduce the "cassandra-dtest" label
3ec2a6f is described below

commit 3ec2a6f2ad192e518723e370c3de399b0127ab32
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Thu Mar 11 11:54:18 2021 +0100

    In Jenkins, introduce the "cassandra-dtest" label
    
    DTests jobs take up a lot of disk space, becuase there is a git clone per split. Agents with not enough disk space can still be used by excluding dtests jobs.
---
 jenkins-dsl/cassandra_job_dsl_seed.groovy | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index b3253a8..dd4374f 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -18,10 +18,14 @@ def slaveLabel = 'cassandra'
 if(binding.hasVariable("CASSANDRA_SLAVE_LABEL")) {
     slaveLabel = "${CASSANDRA_SLAVE_LABEL}"
 }
+def dtestSlaveLabel = 'cassandra-dtest'
+if(binding.hasVariable("CASSANDRA_DTEST_SLAVE_LABEL")) {
+    dtestSlaveLabel = "${CASSANDRA_DTEST_SLAVE_LABEL}"
+}
 // The dtest-large target needs to run on >=32G slaves
-def largeSlaveLabel = 'cassandra-large'
-if(binding.hasVariable("CASSANDRA_LARGE_SLAVE_LABEL")) {
-    largeSlaveLabel = "${CASSANDRA_LARGE_SLAVE_LABEL}"
+def dtestLargeSlaveLabel = 'cassandra-dtest-large'
+if(binding.hasVariable("CASSANDRA_DTEST_LARGE_SLAVE_LABEL")) {
+    dtestLargeSlaveLabel = "${CASSANDRA_LARGE_SLAVE_LABEL}"
 }
 def mainRepo = "https://github.com/apache/cassandra.git"
 def githubRepo = "https://github.com/apache/cassandra"
@@ -566,7 +570,11 @@ cassandraBranches.each {
                     }
                     (1..splits).each { values << it.toString() }
                     text('split', values)
-                    label('label', slaveLabel)
+                    if (targetName == 'dtest-large' || targetName == 'dtest-large-novnode') {
+                        label('label', dtestLargeSlaveLabel)
+                    } else {
+                        label('label', dtestSlaveLabel)
+                    }
                 }
                 configure { node ->
                     node / scm / branches / 'hudson.plugins.git.BranchSpec' / name(branchName)
@@ -881,9 +889,9 @@ dtestTargets.each {
             (1..splits).each { values << it.toString() }
             text('split', values)
             if (targetName == 'dtest-large' || targetName == 'dtest-large-novnode') {
-                label('label', largeSlaveLabel)
+                label('label', dtestLargeSlaveLabel)
             } else {
-                label('label', slaveLabel)
+                label('label', dtestSlaveLabel)
             }
          }
         properties {


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