You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ms...@apache.org on 2016/12/13 17:43:44 UTC
cassandra-builds git commit: Add dtest variation jobs to DSL
Repository: cassandra-builds
Updated Branches:
refs/heads/master dac4ddfb9 -> bb0105561
Add dtest variation jobs to DSL
Project: http://git-wip-us.apache.org/repos/asf/cassandra-builds/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra-builds/commit/bb010556
Tree: http://git-wip-us.apache.org/repos/asf/cassandra-builds/tree/bb010556
Diff: http://git-wip-us.apache.org/repos/asf/cassandra-builds/diff/bb010556
Branch: refs/heads/master
Commit: bb010556128d7e62bfc428143a03b77ce897addd
Parents: dac4ddf
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Dec 13 11:43:39 2016 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Dec 13 11:43:39 2016 -0600
----------------------------------------------------------------------
jenkins-dsl/cassandra_job_dsl_seed.groovy | 29 +++++++++++++++++---------
1 file changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra-builds/blob/bb010556/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 2c56f38..02bf485 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -15,6 +15,7 @@ def buildDescStr = 'REF = ${GIT_BRANCH} <br /> COMMIT = ${GIT_COMMIT}'
def cassandraBranches = ['cassandra-2.2', 'cassandra-3.0', 'cassandra-3.11', 'cassandra-3.X', 'trunk']
// Ant test targets
def testTargets = ['test', 'test-all', 'test-burn', 'test-cdc', 'test-compression']
+def dtestTargets = ['dtest', 'dtest-novnode', 'dtest-offheap'] // dtest-large target exists, but no large servers to run on..
////////////////////////////////////////////////////////////
//
@@ -205,7 +206,7 @@ cassandraBranches.each {
// Skip test-cdc on cassandra-2.2 and cassandra-3.0 branches
if ((targetName == 'test-cdc') && ((branchName == 'cassandra-2.2') || (branchName == 'cassandra-3.0'))) {
- println("Skipping ${targetName} on branch ${branchName}");
+ println("Skipping ${targetName} on branch ${branchName}")
} else {
job("${jobNamePrefix}-${targetName}") {
disabled(false)
@@ -223,15 +224,23 @@ cassandraBranches.each {
/**
* Main branch dtest variation jobs
*/
- // TODO: set up variations similar to unittest above, ie. novnodes - currently, this is a default dtest run for each branch
- job("${jobNamePrefix}-dtest") {
- disabled(false)
- using('Cassandra-template-dtest')
- configure { node ->
- node / scm / branches / 'hudson.plugins.git.BranchSpec' / name(branchName)
- }
- steps {
- shell("./cassandra-builds/build-scripts/cassandra-dtest.sh")
+ dtestTargets.each {
+ def targetName = it
+
+ // Skip dtest-offheap on cassandra-3.0 branch
+ if ((targetName == 'dtest-offheap') && (branchName == 'cassandra-3.0')) {
+ println("Skipping ${targetName} on branch ${branchName}")
+ } else {
+ job("${jobNamePrefix}-${targetName}") {
+ disabled(false)
+ using('Cassandra-template-dtest')
+ configure { node ->
+ node / scm / branches / 'hudson.plugins.git.BranchSpec' / name(branchName)
+ }
+ steps {
+ shell("./cassandra-builds/build-scripts/cassandra-dtest.sh ${targetName}")
+ }
+ }
}
}