You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2021/02/08 10:39:08 UTC
[cassandra-builds] branch trunk updated: Add microbench as a target
in cassandra-test.sh, and as a jenkins job
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8eff385 Add microbench as a target in cassandra-test.sh, and as a jenkins job
8eff385 is described below
commit 8eff3855117b37d304711ce182edc516ea0fbd35
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Sat Dec 26 19:20:24 2020 +0100
Add microbench as a target in cassandra-test.sh, and as a jenkins job
The jenkins jmh report plugin needs the jmh-result.json remaining.
patch by Mick Semb Wever; reviewed by Tomek Łasica for CASSANDRA-16371
---
build-scripts/cassandra-test.sh | 3 +++
jenkins-dsl/cassandra_job_dsl_seed.groovy | 24 +++++++++++++++++-------
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/build-scripts/cassandra-test.sh b/build-scripts/cassandra-test.sh
index 499039f..a9b0a8d 100755
--- a/build-scripts/cassandra-test.sh
+++ b/build-scripts/cassandra-test.sh
@@ -74,6 +74,9 @@ _main() {
ant fqltool-build-test
ant $target -Dtmp.dir="$(pwd)/tmp" || echo "failed $target"
;;
+ "microbench")
+ ant $target -Dtmp.dir="$(pwd)/tmp" -Dmaven.test.failure.ignore=true
+ ;;
"test")
ant testclasslist -Dtest.classlistfile=<( _list_tests "unit" ) -Dtmp.dir="${TMP_DIR}" || echo "failed $target"
;;
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index f2dfcf9..16aa48e 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -49,7 +49,7 @@ if(binding.hasVariable("CASSANDRA_BRANCHES")) {
cassandraBranches = "${CASSANDRA_BRANCHES}".split(",")
}
// Ant test targets
-def testTargets = ['test', 'test-burn', 'test-cdc', 'test-compression', 'stress-test', 'fqltool-test', 'long-test', 'jvm-dtest', 'jvm-dtest-upgrade']
+def testTargets = ['test', 'test-burn', 'test-cdc', 'test-compression', 'stress-test', 'fqltool-test', 'long-test', 'jvm-dtest', 'jvm-dtest-upgrade', 'microbench']
if(binding.hasVariable("CASSANDRA_ANT_TEST_TARGETS")) {
testTargets = "${CASSANDRA_ANT_TEST_TARGETS}".split(",")
}
@@ -233,7 +233,7 @@ matrixJob('Cassandra-template-test') {
steps {
buildDescription('', buildDescStr)
shell("""
- git clean -xdff ;
+ git clean -xdff -e build/test/jmh-result.json ;
git clone --depth 1 --single-branch -b ${buildsBranch} ${buildsRepo} ;
echo "cassandra-builds at: `git -C cassandra-builds log -1 --pretty=format:'%h %an %ad %s'`" ;
echo "\${JOB_BASE_NAME}: `git log -1 --pretty=format:'%h %an %ad %s'`" > \${JOB_BASE_NAME}.head ;
@@ -253,7 +253,7 @@ matrixJob('Cassandra-template-test') {
publishOverSsh {
server('Nightlies') {
transferSet {
- sourceFiles("build/test/logs/**")
+ sourceFiles("build/test/logs/**,build/test/jmh-result.json")
remoteDirectory("cassandra/\${JOB_NAME}/\${BUILD_NUMBER}/")
}
}
@@ -262,7 +262,7 @@ matrixJob('Cassandra-template-test') {
postBuildTask {
task('.', """
echo "Finding job process orphans…"; if pgrep -af "\${JOB_BASE_NAME}"; then pkill -9 -f "\${JOB_BASE_NAME}"; fi;
- echo "Cleaning project…"; git clean -xdff ;
+ echo "Cleaning project…"; git clean -xdff -e build/test/jmh-result.json ;
echo "Pruning docker…" ; docker system prune --all --force --filter "until=${maxJobHours}h" ;
echo "Reporting disk usage…"; du -xm / 2>/dev/null | sort -rn | head -n 30 ; df -h ;
echo "Cleaning tmp…";
@@ -524,6 +524,16 @@ cassandraBranches.each {
find build/test/logs -type f -name "*.log" | xargs xz -qq
""")
}
+ if (targetName == 'microbench') {
+ publishers {
+ jmhReport {
+ resultPath('build/test/jmh-result.json')
+ }
+ archiveJunit('build/test/**/TEST-*.xml') {
+ allowEmptyResults(true)
+ }
+ }
+ }
}
}
}
@@ -776,7 +786,7 @@ testTargets.each {
steps {
buildDescription('', buildDescStr)
shell("""
- git clean -xdff ;
+ git clean -xdff ${targetName == 'microbench' ? '-e build/test/jmh-result.json' : ''};
git clone --depth 1 --single-branch -b ${buildsBranch} ${buildsRepo} ;
echo "cassandra-builds at: `git -C cassandra-builds log -1 --pretty=format:'%h %an %ad %s'`" ;
echo "Cassandra-devbranch-${targetName} cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > Cassandra-devbranch-${targetName}.head ;
@@ -790,7 +800,7 @@ testTargets.each {
publishOverSsh {
server('Nightlies') {
transferSet {
- sourceFiles("build/test/logs/**")
+ sourceFiles("build/test/logs/**,build/test/jmh-result.json")
remoteDirectory("cassandra/devbranch/Cassandra-devbranch-${targetName}/\${BUILD_NUMBER}/\${JOB_NAME}/")
}
}
@@ -807,7 +817,7 @@ testTargets.each {
postBuildTask {
task('.', """
echo "Finding job process orphans…"; if pgrep -af "\${JOB_BASE_NAME}"; then pkill -9 -f "\${JOB_BASE_NAME}"; fi;
- echo "Cleaning project…"; git clean -xdff ;
+ echo "Cleaning project…"; git clean -xdff ${targetName == 'microbench' ? '-e build/test/jmh-result.json' : ''};
echo "Pruning docker…" ; docker system prune --all --force --filter "until=${maxJobHours}h" ;
echo "Reporting disk usage…"; du -xm / 2>/dev/null | sort -rn | head -n 30 ; df -h ;
echo "Cleaning tmp…";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org