This is an automated email from the ASF dual-hosted git repository. sorabh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit d4f3304178f09f9fd7593ea70ffbff949c289e82 Author: Vitalii Diravka <vitalii.dira...@gmail.com> AuthorDate: Mon Jul 2 00:47:13 2018 +0300 DRILL-6559: Travis timing out * Excluding contrib module tests and all exec TPCH unit tests for travis full build. * Introducing new TRAVIS profile * Travis build is faster for 4-5 mins closes #1364 --- .travis.yml | 2 +- contrib/pom.xml | 9 +++++++++ .../java/org/apache/drill/exec/store/mongo/MongoTestSuit.java | 4 ++++ .../apache/drill/exec/store/mongo/TestMongoChunkAssignment.java | 3 ++- .../java-exec/src/test/java/org/apache/drill/TestTpchLimit0.java | 4 ++-- .../src/test/java/org/apache/drill/TestTpchSingleMode.java | 3 +++ 6 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3dce22c..afbfb09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,4 @@ cache: directories: - "$HOME/.m2" install: MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -script: mvn install -Drat.skip=false -Dlicense.skip=false -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 -DmemoryMb=2560 -DdirectMemoryMb=4608 +script: mvn install -Drat.skip=false -Dlicense.skip=false -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 -DmemoryMb=2560 -DdirectMemoryMb=4608 -Ptravis diff --git a/contrib/pom.xml b/contrib/pom.xml index 6ae2330..5d45d9d 100644 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -47,4 +47,13 @@ <module>data</module> <module>gis</module> </modules> + + <profiles> + <profile> + <id>travis</id> + <properties> + <skipTests>true</skipTests> + </properties> + </profile> + </profiles> </project> diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuit.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuit.java index 4e5ca37..33431a6 100644 --- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuit.java +++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuit.java @@ -26,10 +26,13 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.Lists; +import org.apache.drill.categories.MongoStorageTest; +import org.apache.drill.categories.SlowTest; import org.bson.Document; import org.bson.conversions.Bson; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @@ -63,6 +66,7 @@ import de.flapdoodle.embed.process.runtime.Network; @RunWith(Suite.class) @SuiteClasses({ TestMongoFilterPushDown.class, TestMongoProjectPushDown.class, TestMongoQueries.class, TestMongoChunkAssignment.class }) +@Category({SlowTest.class, MongoStorageTest.class}) public class MongoTestSuit implements MongoTestConstants { private static final Logger logger = LoggerFactory diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java index 638cacb..efe450f 100644 --- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java +++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Set; import org.apache.drill.categories.MongoStorageTest; +import org.apache.drill.categories.SlowTest; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; import org.apache.drill.exec.store.mongo.common.ChunkInfo; @@ -39,7 +40,7 @@ import com.google.common.collect.Sets; import com.mongodb.ServerAddress; import org.junit.experimental.categories.Category; -@Category(MongoStorageTest.class) +@Category({SlowTest.class, MongoStorageTest.class}) public class TestMongoChunkAssignment { static final String HOST_A = "A"; static final String HOST_B = "B"; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchLimit0.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchLimit0.java index 51aea18..e84bb27 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchLimit0.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchLimit0.java @@ -17,13 +17,13 @@ */ package org.apache.drill; -import org.apache.drill.categories.PlannerTest; +import org.apache.drill.categories.SlowTest; import org.apache.drill.test.BaseTestQuery; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(PlannerTest.class) +@Category({SlowTest.class}) public class TestTpchLimit0 extends BaseTestQuery { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestTpchLimit0.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchSingleMode.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchSingleMode.java index a3e34c0..dc1848b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchSingleMode.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchSingleMode.java @@ -17,10 +17,13 @@ */ package org.apache.drill; +import org.apache.drill.categories.SlowTest; import org.apache.drill.test.BaseTestQuery; import org.junit.Ignore; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category({SlowTest.class}) public class TestTpchSingleMode extends BaseTestQuery { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestTpchSingleMode.class);