[cassandra-builds] branch master updated: Jenkins build for jvm test should use testclasslist to support parameterized tests (CASSANDRA-15639)

[mc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git


The following commit(s) were added to refs/heads/master by this push:
     new 9781ca1  Jenkins build for jvm test should use testclasslist to support parameterized tests (CASSANDRA-15639)
9781ca1 is described below

commit 9781ca1b4e7489afa09a33b8943d599b47cfe233
Author: mck <mc...@apache.org>
AuthorDate: Sun Mar 15 23:29:40 2020 +0100

    Jenkins build for jvm test should use testclasslist to support parameterized tests (CASSANDRA-15639)
---
 build-scripts/cassandra-jvm-dtest.sh      | 32 +++++++++++++++++++++++++++++++
 jenkins-dsl/cassandra_job_dsl_seed.groovy | 14 +++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/build-scripts/cassandra-jvm-dtest.sh b/build-scripts/cassandra-jvm-dtest.sh
new file mode 100755
index 0000000..1304a82
--- /dev/null
+++ b/build-scripts/cassandra-jvm-dtest.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -o xtrace
+set -o errexit
+set -o pipefail
+set -o nounset
+
+# lists all tests for the specific test type
+_list_tests() {
+  local readonly classlistprefix="$1"
+
+  find "test/$classlistprefix" -name '*Test.java' | sed "s;^test/$classlistprefix/;;g"
+}
+
+_list_tests_no_upgrade() {
+ _list_tests "distributed" | grep -v "upgrade"
+}
+
+_main() {
+  local java_version
+  java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F. '{print $1}')
+  if [ "$java_version" -ge 11 ]; then
+    export CASSANDRA_USE_JDK11=true
+  fi
+
+  local test_timeout
+  test_timeout=$(grep 'name="test.distributed.timeout"' build.xml | awk -F'"' '{print $4}')
+
+  ant testclasslist -Dtest.timeout="$test_timeout" -Dtest.classlistfile=<( _list_tests_no_upgrade ) -Dtest.classlistprefix=distributed
+}
+
+_main "$@"
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 84fce32..bd8481e 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -41,10 +41,11 @@ if(binding.hasVariable("CASSANDRA_BRANCHES")) {
     cassandraBranches = "${CASSANDRA_BRANCHES}".split(",")
 }
 // Ant test targets
-def testTargets = ['test', 'test-burn', 'test-cdc', 'test-compression', 'test-jvm-dtest-forking', 'stress-test', 'fqltool-test', 'long-test']
+def testTargets = ['test', 'test-burn', 'test-cdc', 'test-compression', 'stress-test', 'fqltool-test', 'long-test']
 if(binding.hasVariable("CASSANDRA_ANT_TEST_TARGETS")) {
     testTargets = "${CASSANDRA_ANT_TEST_TARGETS}".split(",")
 }
+
 // Dtest test targets
 def dtestTargets = ['dtest', 'dtest-novnode', 'dtest-offheap' /*, 'dtest-large'*/] // Skipping dtest-large until there are agents with >=32GB ram available
 if(binding.hasVariable("CASSANDRA_DTEST_TEST_TARGETS")) {
@@ -372,6 +373,17 @@ cassandraBranches.each {
         }
     }
 
+     job("${jobNamePrefix}-test-jvm-dtest-forking") {
+        disabled(false)
+        using('Cassandra-template-test')
+        configure { node ->
+            node / scm / branches / 'hudson.plugins.git.BranchSpec' / name(branchName)
+        }
+        steps {
+            shell("./cassandra-builds/build-scripts/cassandra-jvm-dtest.sh")
+        }
+    }
+
     /**
      * Main branch dtest variation jobs
      */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org