Add dtest jobs to DSL
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 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 @@
}
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 @@
}
}
-// /**
-// * 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.
}
