Repository: cassandra-builds Updated Branches: refs/heads/master b26ac0903 -> ce91316c1
Skip test-cdc on cassandra-2.2 and cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra-builds/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra-builds/commit/ce91316c Tree: http://git-wip-us.apache.org/repos/asf/cassandra-builds/tree/ce91316c Diff: http://git-wip-us.apache.org/repos/asf/cassandra-builds/diff/ce91316c Branch: refs/heads/master Commit: ce91316c1510c2733d1647f9ba727934b4378155 Parents: b26ac09 Author: Michael Shuler <mich...@pbandjelly.org> Authored: Tue Nov 29 16:08:24 2016 -0600 Committer: Michael Shuler <mich...@pbandjelly.org> Committed: Tue Nov 29 16:08:24 2016 -0600 ---------------------------------------------------------------------- jenkins-dsl/cassandra_job_dsl_seed.groovy | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra-builds/blob/ce91316c/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 d087226..c099c3f 100644 --- a/jenkins-dsl/cassandra_job_dsl_seed.groovy +++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy @@ -198,14 +198,19 @@ cassandraBranches.each { testTargets.each { def targetName = it - job("${jobNamePrefix}-${targetName}") { - disabled(false) - using('Cassandra-template-test') - configure { node -> - node / scm / branches / 'hudson.plugins.git.BranchSpec' / name(branchName) - } - steps { - shell("./cassandra-builds/build-scripts/cassandra-unittest.sh ${targetName}") + // 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}"); + } else { + job("${jobNamePrefix}-${targetName}") { + disabled(false) + using('Cassandra-template-test') + configure { node -> + node / scm / branches / 'hudson.plugins.git.BranchSpec' / name(branchName) + } + steps { + shell("./cassandra-builds/build-scripts/cassandra-unittest.sh ${targetName}") + } } } }
