Repository: cassandra-builds Updated Branches: refs/heads/master bdb23517c -> 8202d6620
Add dtest 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/8202d662 Tree: http://git-wip-us.apache.org/repos/asf/cassandra-builds/tree/8202d662 Diff: http://git-wip-us.apache.org/repos/asf/cassandra-builds/diff/8202d662 Branch: refs/heads/master Commit: 8202d6620558e2bf54a6389c281c7a87bf3c15bb Parents: bdb2351 Author: Michael Shuler <[email protected]> Authored: Wed Nov 30 16:09:03 2016 -0600 Committer: Michael Shuler <[email protected]> Committed: Wed Nov 30 16:09:03 2016 -0600 ---------------------------------------------------------------------- jenkins-dsl/cassandra_job_dsl_seed.groovy | 41 ++++++++++++-------------- 1 file changed, 19 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra-builds/blob/8202d662/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 c099c3f..ca6dc33 100644 --- a/jenkins-dsl/cassandra_job_dsl_seed.groovy +++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy @@ -9,6 +9,7 @@ def jdkLabel = 'jdk1.8.0_66-unlimited-security' def slaveLabel = 'cassandra' 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' def buildDescStr = 'REF = ${GIT_BRANCH} <br /> COMMIT = ${GIT_COMMIT}' // Cassandra active branches def cassandraBranches = ['cassandra-2.2', 'cassandra-3.0', 'cassandra-3.11', 'cassandra-3.X', 'trunk'] @@ -153,11 +154,12 @@ job('Cassandra-template-dtest') { } steps { buildDescription('', buildDescStr) - shell("git clean -xdff ; git clone ${buildsRepo}") + shell("git clean -xdff ; git clone ${buildsRepo} ; git clone ${dtestRepo}") } publishers { + archiveArtifacts('cassandra-dtest/test_stdout.txt') junit { - testResults('nosetests.xml') + testResults('cassandra-dtest/nosetests.xml') testDataPublishers { stabilityTestDataPublisher() } @@ -215,25 +217,20 @@ cassandraBranches.each { } } -// /** -// * Main branch dtest variation jobs -// */ -// dtestTargets.each { -// def targetName = it -// -// 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}") -// } -// } -// } - - - + /** + * 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") + } + } +// The End. }
