From 5c3d5af5fa8ab6623e15180467e19c188365daaf Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Fri, 20 Dec 2019 12:22:37 +0100 Subject: [PATCH 1/4] HDDS-2785. Move ozonefs and tools minicluster tests to integration-test --- .../dev-support/checks/integration.sh | 2 +- hadoop-ozone/dev-support/checks/unit.sh | 2 +- hadoop-ozone/integration-test/pom.xml | 24 +++++++++++++++++++ .../fs/ozone/TestOzoneFSInputStream.java | 0 .../fs/ozone/TestOzoneFileInterfaces.java | 0 .../hadoop/fs/ozone/TestOzoneFileSystem.java | 0 .../hadoop/fs/ozone/TestOzoneFsHAURLs.java | 0 .../hadoop/fs/ozone/TestOzoneFsRenameDir.java | 0 .../contract/ITestOzoneContractCreate.java | 0 .../contract/ITestOzoneContractDelete.java | 0 .../contract/ITestOzoneContractDistCp.java | 0 .../ITestOzoneContractGetFileStatus.java | 0 .../contract/ITestOzoneContractMkdir.java | 0 .../contract/ITestOzoneContractOpen.java | 0 .../contract/ITestOzoneContractRename.java | 0 .../contract/ITestOzoneContractRootDir.java | 0 .../contract/ITestOzoneContractSeek.java | 0 .../fs/ozone/contract/OzoneContract.java | 0 .../apache/hadoop/fs/ozone/package-info.java | 22 +++++++++++++++++ .../hadoop/ozone/freon/TestDataValidate.java | 0 .../TestDataValidateWithDummyContainers.java | 0 ...estDataValidateWithSafeByteOperations.java | 0 ...tDataValidateWithUnsafeByteOperations.java | 0 .../TestFreonWithDatanodeFastRestart.java | 0 .../freon/TestFreonWithDatanodeRestart.java | 0 .../freon/TestFreonWithPipelineDestroy.java | 0 .../ozone/freon/TestRandomKeyGenerator.java | 0 .../ozone/fsck/TestContainerMapper.java | 0 .../apache/hadoop/ozone/om/TestOmSQLCli.java | 0 hadoop-ozone/ozonefs/pom.xml | 18 -------------- hadoop-ozone/tools/pom.xml | 6 ----- 31 files changed, 48 insertions(+), 26 deletions(-) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsRenameDir.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractCreate.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractDelete.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractDistCp.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractGetFileStatus.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractMkdir.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractOpen.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractRename.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractRootDir.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractSeek.java (100%) rename hadoop-ozone/{ozonefs => integration-test}/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java (100%) create mode 100644 hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/package-info.java rename hadoop-ozone/{tools => integration-test}/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java (100%) rename hadoop-ozone/{tools => integration-test}/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java (100%) rename hadoop-ozone/{tools => integration-test}/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java (100%) rename hadoop-ozone/{tools => integration-test}/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java (100%) rename hadoop-ozone/{tools => integration-test}/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java (100%) rename hadoop-ozone/{tools => integration-test}/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java (100%) rename hadoop-ozone/{tools => integration-test}/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java (100%) rename hadoop-ozone/{tools => integration-test}/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java (100%) rename hadoop-ozone/{tools => integration-test}/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java (100%) rename hadoop-ozone/{tools => integration-test}/src/test/java/org/apache/hadoop/ozone/om/TestOmSQLCli.java (100%) diff --git a/hadoop-ozone/dev-support/checks/integration.sh b/hadoop-ozone/dev-support/checks/integration.sh index d7883de34471..23e997e6edda 100755 --- a/hadoop-ozone/dev-support/checks/integration.sh +++ b/hadoop-ozone/dev-support/checks/integration.sh @@ -18,7 +18,7 @@ cd "$DIR/../../.." || exit 1 export MAVEN_OPTS="-Xmx4096m" mvn -B install -DskipTests -mvn -B -fn test -pl :hadoop-ozone-integration-test,:hadoop-ozone-filesystem,:hadoop-ozone-tools "$@" +mvn -B -fn test -pl :hadoop-ozone-integration-test "$@" REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/integration"} mkdir -p "$REPORT_DIR" diff --git a/hadoop-ozone/dev-support/checks/unit.sh b/hadoop-ozone/dev-support/checks/unit.sh index 585375ecfd9d..888ce6d40580 100755 --- a/hadoop-ozone/dev-support/checks/unit.sh +++ b/hadoop-ozone/dev-support/checks/unit.sh @@ -17,7 +17,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd "$DIR/../../.." || exit 1 export MAVEN_OPTS="-Xmx4096m" -mvn -B -DskipShade -Dskip.yarn -fn test -pl \!:hadoop-ozone-integration-test,\!:hadoop-ozone-filesystem,\!:hadoop-ozone-tools "$@" +mvn -B -DskipShade -Dskip.yarn -fn test -pl \!:hadoop-ozone-integration-test "$@" REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/unit"} mkdir -p "$REPORT_DIR" diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index 5593f28e9d44..e8f54e35a42a 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -64,6 +64,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.hadoop hadoop-ozone-client + + org.apache.hadoop + hadoop-ozone-filesystem + + + org.apache.hadoop + hadoop-ozone-tools + commons-lang commons-lang @@ -130,6 +138,22 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test test-jar + + org.apache.hadoop + hadoop-distcp + test + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + test + + + org.apache.hadoop + hadoop-distcp + test + test-jar + diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsRenameDir.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsRenameDir.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsRenameDir.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsRenameDir.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractCreate.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractCreate.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractCreate.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractCreate.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractDelete.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractDelete.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractDelete.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractDelete.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractDistCp.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractDistCp.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractDistCp.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractDistCp.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractGetFileStatus.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractGetFileStatus.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractGetFileStatus.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractGetFileStatus.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractMkdir.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractMkdir.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractMkdir.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractMkdir.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractOpen.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractOpen.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractOpen.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractOpen.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractRename.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractRename.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractRename.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractRename.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractRootDir.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractRootDir.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractRootDir.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractRootDir.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractSeek.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractSeek.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractSeek.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractSeek.java diff --git a/hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java similarity index 100% rename from hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/package-info.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/package-info.java new file mode 100644 index 000000000000..51284c2db4a7 --- /dev/null +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + * + */ +/** + * Ozone FS Contract tests. + */ +package org.apache.hadoop.fs.ozone; \ No newline at end of file diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java similarity index 100% rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java similarity index 100% rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java similarity index 100% rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java similarity index 100% rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java similarity index 100% rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java similarity index 100% rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java similarity index 100% rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java similarity index 100% rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java similarity index 100% rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/om/TestOmSQLCli.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSQLCli.java similarity index 100% rename from hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/om/TestOmSQLCli.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSQLCli.java diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml index 4f8507014372..0401eb396507 100644 --- a/hadoop-ozone/ozonefs/pom.xml +++ b/hadoop-ozone/ozonefs/pom.xml @@ -157,12 +157,6 @@ test test-jar - - org.apache.hadoop - hadoop-ozone-integration-test - test - test-jar - org.mockito @@ -196,24 +190,12 @@ powermock-module-junit4 1.6.5 test - - - org.javassist - javassist - - org.powermock powermock-api-mockito 1.6.5 test - - - org.hamcrest - hamcrest-core - - diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index fdfa11cdedc6..a9c869dc8c9f 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -111,12 +111,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test test-jar - - org.apache.hadoop - hadoop-ozone-integration-test - test - test-jar - org.mockito mockito-core From c653076445c7c1d4c4b9106d75d5fc503049611f Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Fri, 20 Dec 2019 13:06:11 +0100 Subject: [PATCH 2/4] HDDS-2785. Also move contract test-specific plugin config --- hadoop-ozone/integration-test/pom.xml | 18 ++++++++++++++++++ hadoop-ozone/ozonefs/pom.xml | 13 ------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index e8f54e35a42a..082e785c5927 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -156,5 +156,23 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ITestOzoneContract*.java + **/Test*.java + **/*Test.java + **/*Tests.java + **/*TestCase.java + + + + + + diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml index 0401eb396507..f738112b0cd4 100644 --- a/hadoop-ozone/ozonefs/pom.xml +++ b/hadoop-ozone/ozonefs/pom.xml @@ -62,19 +62,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - ITestOzoneContract*.java - **/Test*.java - **/*Test.java - **/*Tests.java - **/*TestCase.java - - - org.codehaus.mojo animal-sniffer-maven-plugin From 0a4efca7b22aea52f46d0154b2521f1b8a002fbe Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Fri, 20 Dec 2019 13:06:25 +0100 Subject: [PATCH 3/4] HDDS-2785. Remove leftover dependencies --- hadoop-ozone/ozonefs/pom.xml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml index f738112b0cd4..675f1ce29f48 100644 --- a/hadoop-ozone/ozonefs/pom.xml +++ b/hadoop-ozone/ozonefs/pom.xml @@ -156,22 +156,6 @@ junit test - - org.apache.hadoop - hadoop-distcp - test - - - org.apache.hadoop - hadoop-distcp - test - test-jar - - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - test - org.powermock powermock-module-junit4 From cf36fe1aeb35246c684f4c22aee76901b064b506 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Fri, 20 Dec 2019 15:49:49 +0100 Subject: [PATCH 4/4] HDDS-2785. Move test resource, too --- .../src/test/resources/contract/ozone.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hadoop-ozone/{ozonefs => integration-test}/src/test/resources/contract/ozone.xml (100%) diff --git a/hadoop-ozone/ozonefs/src/test/resources/contract/ozone.xml b/hadoop-ozone/integration-test/src/test/resources/contract/ozone.xml similarity index 100% rename from hadoop-ozone/ozonefs/src/test/resources/contract/ozone.xml rename to hadoop-ozone/integration-test/src/test/resources/contract/ozone.xml