Repository: cassandra-builds Updated Branches: refs/heads/master a018b48b4 -> 160eecc93
Enable dtest-large target jobs Project: http://git-wip-us.apache.org/repos/asf/cassandra-builds/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra-builds/commit/160eecc9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra-builds/tree/160eecc9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra-builds/diff/160eecc9 Branch: refs/heads/master Commit: 160eecc93bedc9a035fb482499ee6c5db58eae47 Parents: a018b48 Author: Michael Shuler <mich...@pbandjelly.org> Authored: Thu Mar 23 10:38:58 2017 -0500 Committer: Michael Shuler <mich...@pbandjelly.org> Committed: Thu Mar 23 10:38:58 2017 -0500 ---------------------------------------------------------------------- jenkins-dsl/cassandra_job_dsl_seed.groovy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra-builds/blob/160eecc9/jenkins-dsl/cassandra_job_dsl_seed.groovy ---------------------------------------------------------------------- diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy index 515965d..1ca7108 100644 --- a/jenkins-dsl/cassandra_job_dsl_seed.groovy +++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy @@ -7,6 +7,8 @@ def jobDescription = 'Apache Cassandra DSL-generated job - DSL git repo: <a href="https://git-wip-us.apache.org/repos/asf?p=cassandra-builds.git";>cassandra-builds</a>' def jdkLabel = 'JDK 1.8 (latest)' def slaveLabel = 'cassandra' +// The dtest-large target needs to run on >=32G slaves, so we provide an "OR" list of those servers +def largeSlaveLabel = 'cassandra6||cassandra7' def mainRepo = 'https://git-wip-us.apache.org/repos/asf/cassandra.git' def buildsRepo = 'https://git.apache.org/cassandra-builds.git' def dtestRepo = 'https://github.com/riptano/cassandra-dtest.git' @@ -16,7 +18,7 @@ def cassandraBranches = ['cassandra-2.2', 'cassandra-3.0', 'cassandra-3.11', 'tr // Ant test targets def testTargets = ['test', 'test-all', 'test-burn', 'test-cdc', 'test-compression'] // Dtest test targets -def dtestTargets = ['dtest', 'dtest-novnode', 'dtest-offheap'] // dtest-large target exists, but no large servers to run on.. +def dtestTargets = ['dtest', 'dtest-novnode', 'dtest-offheap', 'dtest-large'] //////////////////////////////////////////////////////////// // @@ -294,6 +296,9 @@ cassandraBranches.each { job("${jobNamePrefix}-${targetName}") { disabled(false) using('Cassandra-template-dtest') + if (targetName == 'dtest-large') { + label(largeSlaveLabel) + } configure { node -> node / scm / branches / 'hudson.plugins.git.BranchSpec' / name(branchName) }
