This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch ozone-0.4.1 in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/ozone-0.4.1 by this push: new e8ea4dd HDDS-1735. Create separate unit and integration test executor dev-support script e8ea4dd is described below commit e8ea4dda04abbf02d426f5df882f1ac89b89f05b Author: Márton Elek <e...@apache.org> AuthorDate: Sat Jun 29 01:59:44 2019 +0200 HDDS-1735. Create separate unit and integration test executor dev-support script (cherry picked from commit 0bae9e8ec8b53a3b484eaa01a3fa3f177d56b3e4) --- hadoop-ozone/dev-support/checks/acceptance.sh | 3 ++- hadoop-ozone/dev-support/checks/author.sh | 1 - hadoop-ozone/dev-support/checks/build.sh | 2 +- hadoop-ozone/dev-support/checks/checkstyle.sh | 5 ++++- hadoop-ozone/dev-support/checks/findbugs.sh | 2 +- hadoop-ozone/dev-support/checks/{unit.sh => integration.sh} | 3 ++- hadoop-ozone/dev-support/checks/rat.sh | 5 ++++- hadoop-ozone/dev-support/checks/unit.sh | 2 +- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/hadoop-ozone/dev-support/checks/acceptance.sh b/hadoop-ozone/dev-support/checks/acceptance.sh index 8de920f..258c4e2 100755 --- a/hadoop-ozone/dev-support/checks/acceptance.sh +++ b/hadoop-ozone/dev-support/checks/acceptance.sh @@ -15,5 +15,6 @@ # limitations under the License. DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export HADOOP_VERSION=3 -"$DIR/../../../hadoop-ozone/dist/target/ozone-*-SNAPSHOT/compose/test-all.sh" +OZONE_VERSION=$(cat $DIR/../../pom.xml | grep "<ozone.version>" | sed 's/<[^>]*>//g'| sed 's/^[ \t]*//') +"$DIR/../../dist/target/ozone-$OZONE_VERSION/compose/test-all.sh" exit $? diff --git a/hadoop-ozone/dev-support/checks/author.sh b/hadoop-ozone/dev-support/checks/author.sh index 43caa70..56d15a5 100755 --- a/hadoop-ozone/dev-support/checks/author.sh +++ b/hadoop-ozone/dev-support/checks/author.sh @@ -13,7 +13,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -mkdir -p ./target grep -r --include="*.java" "@author" . if [ $? -gt 0 ]; then exit 0 diff --git a/hadoop-ozone/dev-support/checks/build.sh b/hadoop-ozone/dev-support/checks/build.sh index 6a7811e..71bf778 100755 --- a/hadoop-ozone/dev-support/checks/build.sh +++ b/hadoop-ozone/dev-support/checks/build.sh @@ -14,5 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. export MAVEN_OPTS="-Xmx4096m" -mvn -am -pl :hadoop-ozone-dist -P hdds -Dmaven.javadoc.skip=true -DskipTests clean install +mvn -B -f pom.ozone.xml -Dmaven.javadoc.skip=true -DskipTests clean install exit $? diff --git a/hadoop-ozone/dev-support/checks/checkstyle.sh b/hadoop-ozone/dev-support/checks/checkstyle.sh index 0d80fbc..323cbc8 100755 --- a/hadoop-ozone/dev-support/checks/checkstyle.sh +++ b/hadoop-ozone/dev-support/checks/checkstyle.sh @@ -13,7 +13,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -mvn -fn checkstyle:check -am -pl :hadoop-ozone-dist -Phdds +mvn -B -fn checkstyle:check -f pom.ozone.xml + +#Print out the exact violations with parsing XML results with sed +find -name checkstyle-errors.xml | xargs sed '$!N; /<file.*\n<\/file/d;P;D' | sed '/<\/.*/d;/<checkstyle.*/d;s/<error.*line="\([[:digit:]]*\)".*message="\([^"]\+\).*/ \1: \2/;s/<file name="\([^"]*\)".*/\1/;/<\?xml.*>/d' violations=$(grep -r error --include checkstyle-errors.xml .| wc -l) if [[ $violations -gt 0 ]]; then diff --git a/hadoop-ozone/dev-support/checks/findbugs.sh b/hadoop-ozone/dev-support/checks/findbugs.sh index 1328492..c8bd40b 100755 --- a/hadoop-ozone/dev-support/checks/findbugs.sh +++ b/hadoop-ozone/dev-support/checks/findbugs.sh @@ -20,7 +20,7 @@ mkdir -p ./target rm "$FINDBUGS_ALL_FILE" || true touch "$FINDBUGS_ALL_FILE" -mvn -fn findbugs:check -Dfindbugs.failOnError=false -am -pl :hadoop-ozone-dist -Phdds +mvn -B compile -fn findbugs:check -Dfindbugs.failOnError=false -f pom.ozone.xml find hadoop-ozone -name findbugsXml.xml | xargs -n1 convertXmlToText | tee -a "${FINDBUGS_ALL_FILE}" find hadoop-hdds -name findbugsXml.xml | xargs -n1 convertXmlToText | tee -a "${FINDBUGS_ALL_FILE}" diff --git a/hadoop-ozone/dev-support/checks/unit.sh b/hadoop-ozone/dev-support/checks/integration.sh similarity index 88% copy from hadoop-ozone/dev-support/checks/unit.sh copy to hadoop-ozone/dev-support/checks/integration.sh index d839f22..8270d4f 100755 --- a/hadoop-ozone/dev-support/checks/unit.sh +++ b/hadoop-ozone/dev-support/checks/integration.sh @@ -14,7 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. export MAVEN_OPTS="-Xmx4096m" -mvn -fn test -am -pl :hadoop-ozone-dist -P hdds +mvn -B install -f pom.ozone.xml -DskipTests +mvn -B -fn test -f pom.ozone.xml -pl :hadoop-ozone-integration-test,:hadoop-ozone-filesystem module_failed_tests=$(find "." -name 'TEST*.xml'\ | xargs "grep" -l -E "<failure|<error"\ | awk -F/ '{sub("'"TEST-JUNIT_TEST_OUTPUT_DIR"'",""); sub(".xml",""); print $NF}') diff --git a/hadoop-ozone/dev-support/checks/rat.sh b/hadoop-ozone/dev-support/checks/rat.sh index aadb251..9e16e12 100755 --- a/hadoop-ozone/dev-support/checks/rat.sh +++ b/hadoop-ozone/dev-support/checks/rat.sh @@ -16,7 +16,10 @@ mkdir -p target rm target/rat-aggregated.txt -mvn -fn org.apache.rat:apache-rat-plugin:0.13:check -am -pl :hadoop-ozone-dist -Phdds +cd hadoop-hdds +mvn -B -fn org.apache.rat:apache-rat-plugin:0.13:check +cd ../hadoop-ozone +mvn -B -fn org.apache.rat:apache-rat-plugin:0.13:check grep -r --include=rat.txt "!????" | tee ./target/rat-aggregated.txt if [ "$(cat target/rat-aggregated.txt)" ]; then exit -1 diff --git a/hadoop-ozone/dev-support/checks/unit.sh b/hadoop-ozone/dev-support/checks/unit.sh index d839f22..fe12910 100755 --- a/hadoop-ozone/dev-support/checks/unit.sh +++ b/hadoop-ozone/dev-support/checks/unit.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. export MAVEN_OPTS="-Xmx4096m" -mvn -fn test -am -pl :hadoop-ozone-dist -P hdds +mvn -fn test -f pom.ozone.xml -pl \!:hadoop-ozone-integration-test,\!:hadoop-ozone-filesystem module_failed_tests=$(find "." -name 'TEST*.xml'\ | xargs "grep" -l -E "<failure|<error"\ | awk -F/ '{sub("'"TEST-JUNIT_TEST_OUTPUT_DIR"'",""); sub(".xml",""); print $NF}') --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org