You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org> on 2016/05/27 20:28:18 UTC
Change in asterixdb[master]: Fix Coverage Report
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/893
Change subject: Fix Coverage Report
......................................................................
Fix Coverage Report
Fix the coverage report generated by jacoco plugin, broken by the
great merge, to again include hyracks classes / coverage.
Change-Id: I023e4293954aef291358190e20ef3c5225fe87a6
---
M asterixdb/asterix-coverage/pom.xml
1 file changed, 3 insertions(+), 36 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/93/893/1
diff --git a/asterixdb/asterix-coverage/pom.xml b/asterixdb/asterix-coverage/pom.xml
index 3692fb2..0f7bce3 100644
--- a/asterixdb/asterix-coverage/pom.xml
+++ b/asterixdb/asterix-coverage/pom.xml
@@ -52,35 +52,17 @@
<configuration>
<target if="coverage" unless="skipTests">
<echo message="Generating JaCoCo Reports" />
- <property name="asterix.dir" location="${basedir}/.."/>
- <!-- special case for jenkins -->
- <condition property="hyracks.dir" value="${asterix.dir}/hyracks">
- <available file="${asterix.dir}/hyracks/pom.xml"/>
- </condition>
- <pathconvert property="hyracks.dir">
- <first>
- <dirset dir="${asterix.dir}/..">
- <include name="*hyracks"/>
- </dirset>
- </first>
- </pathconvert>
+ <property name="asterix.dir" location="${basedir}/../.."/>
+
<!-- gather all of the source dirs -->
<pathconvert property="source.dirs" pathsep=",">
<dirset dir="${asterix.dir}">
<include name="**/src/main/java"/>
- <!-- special case for jenkins -->
- <exclude name="hyracks/**"/>
</dirset>
</pathconvert>
- <pathconvert property="hyracks.source.dirs" pathsep=",">
- <dirset dir="${hyracks.dir}">
- <include name="**/src/main/java"/>
- </dirset>
- </pathconvert>
+
<echo message="asterix dir: ${asterix.dir}/"/>
- <echo message="hyracks dir: ${hyracks.dir}"/>
<echo message="asterix source dirs: ${source.dirs}/"/>
- <echo message="hyracks source dirs: ${hyracks.source.dirs}/"/>
<taskdef name="report" classname="org.jacoco.ant.ReportTask">
<classpath path="${basedir}/target/jacoco-jars/org.jacoco.ant.jar" />
@@ -97,25 +79,10 @@
<classfiles>
<fileset dir="${asterix.dir}">
<include name="**/target/classes/**/*.class"/>
- <!-- special case for jenkins -->
- <exclude name="hyracks/**"/>
</fileset>
</classfiles>
<sourcefiles encoding="UTF-8">
<multirootfileset basedirs="${source.dirs}" type="file">
- <include name="**/*.java"/>
- </multirootfileset>
- </sourcefiles>
- </group>
- <group name="Hyracks">
- <classfiles>
- <fileset dir="${hyracks.dir}">
- <include name="**/target/classes/**/*.class"/>
- <exclude name="hyracks/hyracks-hdfs/hyracks-hdfs-1.x/**"/>
- </fileset>
- </classfiles>
- <sourcefiles encoding="UTF-8">
- <multirootfileset basedirs="${hyracks.source.dirs}" type="file">
<include name="**/*.java"/>
</multirootfileset>
</sourcefiles>
--
To view, visit https://asterix-gerrit.ics.uci.edu/893
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I023e4293954aef291358190e20ef3c5225fe87a6
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Change in asterixdb[master]: Fix Coverage Report
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Michael Blow has submitted this change and it was merged.
Change subject: Fix Coverage Report
......................................................................
Fix Coverage Report
Fix the coverage report generated by jacoco plugin, broken by the
great merge, to again include hyracks classes / coverage.
Change-Id: I023e4293954aef291358190e20ef3c5225fe87a6
Reviewed-on: https://asterix-gerrit.ics.uci.edu/893
Reviewed-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
---
M asterixdb/asterix-coverage/pom.xml
1 file changed, 4 insertions(+), 36 deletions(-)
Approvals:
Till Westmann: Looks good to me, approved
Jenkins: Looks good to me, but someone else must approve; Verified
diff --git a/asterixdb/asterix-coverage/pom.xml b/asterixdb/asterix-coverage/pom.xml
index 3692fb2..f71f3a2 100644
--- a/asterixdb/asterix-coverage/pom.xml
+++ b/asterixdb/asterix-coverage/pom.xml
@@ -52,35 +52,17 @@
<configuration>
<target if="coverage" unless="skipTests">
<echo message="Generating JaCoCo Reports" />
- <property name="asterix.dir" location="${basedir}/.."/>
- <!-- special case for jenkins -->
- <condition property="hyracks.dir" value="${asterix.dir}/hyracks">
- <available file="${asterix.dir}/hyracks/pom.xml"/>
- </condition>
- <pathconvert property="hyracks.dir">
- <first>
- <dirset dir="${asterix.dir}/..">
- <include name="*hyracks"/>
- </dirset>
- </first>
- </pathconvert>
+ <property name="asterix.dir" location="${basedir}/../.."/>
+
<!-- gather all of the source dirs -->
<pathconvert property="source.dirs" pathsep=",">
<dirset dir="${asterix.dir}">
<include name="**/src/main/java"/>
- <!-- special case for jenkins -->
- <exclude name="hyracks/**"/>
</dirset>
</pathconvert>
- <pathconvert property="hyracks.source.dirs" pathsep=",">
- <dirset dir="${hyracks.dir}">
- <include name="**/src/main/java"/>
- </dirset>
- </pathconvert>
+
<echo message="asterix dir: ${asterix.dir}/"/>
- <echo message="hyracks dir: ${hyracks.dir}"/>
<echo message="asterix source dirs: ${source.dirs}/"/>
- <echo message="hyracks source dirs: ${hyracks.source.dirs}/"/>
<taskdef name="report" classname="org.jacoco.ant.ReportTask">
<classpath path="${basedir}/target/jacoco-jars/org.jacoco.ant.jar" />
@@ -97,25 +79,11 @@
<classfiles>
<fileset dir="${asterix.dir}">
<include name="**/target/classes/**/*.class"/>
- <!-- special case for jenkins -->
- <exclude name="hyracks/**"/>
+ <exclude name="**/hyracks-hdfs/hyracks-hdfs-1.x/**"/>
</fileset>
</classfiles>
<sourcefiles encoding="UTF-8">
<multirootfileset basedirs="${source.dirs}" type="file">
- <include name="**/*.java"/>
- </multirootfileset>
- </sourcefiles>
- </group>
- <group name="Hyracks">
- <classfiles>
- <fileset dir="${hyracks.dir}">
- <include name="**/target/classes/**/*.class"/>
- <exclude name="hyracks/hyracks-hdfs/hyracks-hdfs-1.x/**"/>
- </fileset>
- </classfiles>
- <sourcefiles encoding="UTF-8">
- <multirootfileset basedirs="${hyracks.source.dirs}" type="file">
<include name="**/*.java"/>
</multirootfileset>
</sourcefiles>
--
To view, visit https://asterix-gerrit.ics.uci.edu/893
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I023e4293954aef291358190e20ef3c5225fe87a6
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in asterixdb[master]: Fix Coverage Report
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Michael Blow has posted comments on this change.
Change subject: Fix Coverage Report
......................................................................
Patch Set 2:
Fix confirmed w/ https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-coverage/34/artifact/asterixdb/asterix-coverage/target/coverage-report/html/AsterixDB/index.html
--
To view, visit https://asterix-gerrit.ics.uci.edu/893
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I023e4293954aef291358190e20ef3c5225fe87a6
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mi...@couchbase.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Fix Coverage Report
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix Coverage Report
......................................................................
Patch Set 2:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/1523/
--
To view, visit https://asterix-gerrit.ics.uci.edu/893
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I023e4293954aef291358190e20ef3c5225fe87a6
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Fix Coverage Report
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix Coverage Report
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/1519/
--
To view, visit https://asterix-gerrit.ics.uci.edu/893
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I023e4293954aef291358190e20ef3c5225fe87a6
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Fix Coverage Report
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: Fix Coverage Report
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/893
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I023e4293954aef291358190e20ef3c5225fe87a6
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Fix Coverage Report
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/893
to look at the new patch set (#2).
Change subject: Fix Coverage Report
......................................................................
Fix Coverage Report
Fix the coverage report generated by jacoco plugin, broken by the
great merge, to again include hyracks classes / coverage.
Change-Id: I023e4293954aef291358190e20ef3c5225fe87a6
---
M asterixdb/asterix-coverage/pom.xml
1 file changed, 4 insertions(+), 36 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/93/893/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/893
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I023e4293954aef291358190e20ef3c5225fe87a6
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>