commit c687f09b4af445030b3d6a22e9c9b28647059e13
author Michael Shuler <michael@pbandjelly.org> Tue Mar 07 12:40:13 2017 -0600
committer Michael Shuler <michael@pbandjelly.org> Tue Mar 07 12:40:13 2017 -0600
tree 6fe51e889c09deaa3f09d0a89217457ae4f9fef2
parent 2bb7a6c51921271f0aa5879dd8529d3350eccf3b

Move JDK to matrix axis

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 35ae725..e069309 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -175,7 +175,6 @@
 matrixJob('Cassandra-template-cqlsh-tests') {
     disabled(true)
     description(jobDescription)
-    jdk(jdkLabel)
     label(slaveLabel)
     logRotator {
         numToKeep(10)
@@ -190,6 +189,7 @@
     }
     axes {
         text('cython', 'yes', 'no')
+        jdk(jdkLabel)
     }
     scm {
         git {
@@ -434,7 +434,6 @@
  */
 matrixJob('Cassandra-devbranch-cqlsh-tests') {
     description(jobDescription)
-    jdk(jdkLabel)
     label(slaveLabel)
     logRotator {
         numToKeep(10)
@@ -451,6 +450,10 @@
         stringParam('REPO', 'apache', 'The github user/org to clone cassandra repo from')
         stringParam('BRANCH', 'trunk', 'The branch of cassandra to checkout')
     }
+    axes {
+        text('cython', 'yes', 'no')
+        jdk(jdkLabel)
+    }
     scm {
         git {
             remote {