Repository: hive Updated Branches: refs/heads/master 956535388 -> ca51b69f5
HIVE-14938. Part2. Updated deployed ptest properties file to remove isolated tests, batch other tests. (Siddharth Seth, reviewed by Prasanth Jayachandran) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ca51b69f Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ca51b69f Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ca51b69f Branch: refs/heads/master Commit: ca51b69f584136b8b268982b546edd3d829e8a44 Parents: 9565353 Author: Siddharth Seth <ss...@apache.org> Authored: Thu Oct 13 23:26:06 2016 -0700 Committer: Siddharth Seth <ss...@apache.org> Committed: Thu Oct 13 23:26:06 2016 -0700 ---------------------------------------------------------------------- .../ptest2/conf/deployed/master-mr2.properties | 41 ++++++++++++++------ 1 file changed, 30 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ca51b69f/testutils/ptest2/conf/deployed/master-mr2.properties ---------------------------------------------------------------------- diff --git a/testutils/ptest2/conf/deployed/master-mr2.properties b/testutils/ptest2/conf/deployed/master-mr2.properties index 0269f4e..02a560e 100644 --- a/testutils/ptest2/conf/deployed/master-mr2.properties +++ b/testutils/ptest2/conf/deployed/master-mr2.properties @@ -20,10 +20,10 @@ javaHomeForTests = /usr/java/jdk1.8.0_25 unitTests.directories = ./ additionalProfiles = -unitTests.isolate = TestAuthorizationPreEventListener TestDefaultHiveMetastoreAuthorizationProvider TestEmbeddedHiveMetaStore TestExecDriver TestHive TestHiveMetaStoreWithEnvironmentContext TestHiveRemote TestMetaStoreAuthorization TestMetaStoreEventListener TestRemoteHiveMetaStore TestRemoteHiveMetaStoreIpAddress TestRemoteUGIHiveMetaStoreIpAddress TestSetUGIOnBothClientServer TestSetUGIOnOnlyClient TestSetUGIOnOnlyServer TestZNodeSetUp TestHCatStorer TestHCatLoader TestHCatExternalDynamicPartitioned TestHCatMutablePartitioned TestHCatDynamicPartitioned TestHCatExternalPartitioned TestHCatMutableDynamicPartitioned +unitTests.isolate = # comes from build-command.xml excludes -unitTests.exclude = TestSerDe TestHiveMetaStore TestHiveServer2Concurrency TestAccumuloCliDriver +unitTests.exclude = TestSerDe TestHiveMetaStore TestHiveServer2Concurrency TestAccumuloCliDriver TestMiniSparkOnYarnCliDriver TestSparkCliDriver TestMultiSessionsHS2WithLocalClusterSpark TestJdbcWithLocalClusterSpark TestEncryptedHDFSCliDriver unitTests.batchSize=20 @@ -44,14 +44,14 @@ ut.orc.batchSize=10 unitTests.module.ql=ql ut.ql.batchSize=10 -ut.ql.skipBatching=TestDbTxnManager2 TestTxnCommands2WithSplitUpdateAndVectorization TestTxnCommands2WithSplitUpdate TestOrcFile +ut.ql.skipBatching=TestDbTxnManager2 TestTxnCommands2WithSplitUpdateAndVectorization TestTxnCommands2WithSplitUpdate TestOrcFile TestTxnCommands2 TestCompactor TestInitiator TestWorker TestWorker2 TestExecDriver unitTests.module.service=service ut.service.batchSize=8 unitTests.module.itests.hive-unit=itests.hive-unit ut.itests.hive-unit.batchSize=9 -ut.itests.hive-unit.skipBatching=TestAcidOnTezWithSplitUpdate TestAcidOnTez TestMTQueries TestCompactor TestSchedulerQueue TestOperationLoggingAPIWithTez TestSSL TestJdbcDriver2 TestJdbcWithMiniHA TestJdbcWithMiniMr +ut.itests.hive-unit.skipBatching=TestAcidOnTezWithSplitUpdate TestAcidOnTez TestMTQueries TestSchedulerQueue TestOperationLoggingAPIWithTez TestSSL TestJdbcDriver2 TestJdbcWithMiniHA TestJdbcWithMiniHS2 TestHBaseAggrStatsCacheIntegration TestEmbeddedHiveMetaStore TestRemoteHiveMetaStore TestSetUGIOnBothClientServer TestSetUGIOnOnlyClient TestSetUGIOnOnlyServer unitTests.module.itests.qtest=itests.qtest ut.itests.qtest.batchSize=9 @@ -59,14 +59,17 @@ ut.itests.qtest.skipBatching=TestCompareCliDriver TestContribCliDriver TestContr unitTests.module.hcatalog.core=hcatalog.core ut.hcatalog.core.batchSize=9 +ut.hcatalog.core.skipBatching=TestHCatExternalDynamicPartitioned TestHCatMutablePartitioned TestHCatDynamicPartitioned TestHCatExternalPartitioned TestHCatMutableDynamicPartitioned +unitTests.module.hcatalog.hcatalog-pig-adapter=hcatalog.hcatalog-pig-adapter +ut.hcatalog.hcatalog-pig-adapter.skipBatching=TestHCatStorer TestHCatLoader -qFileTests = clientPositive miniMr clientNegative miniMrNegative hbasePositive miniTez spark miniLlap miniLlapLocal +qFileTests = clientPositive miniMr clientNegative miniMrNegative hbasePositive miniTez spark miniLlap miniLlapLocal encryptedCli miniSparkOnYarn qFileTests.propertyFiles.mainProperties = itests/src/test/resources/testconfiguration.properties qFileTest.clientPositive.driver = TestCliDriver qFileTest.clientPositive.directory = ql/src/test/queries/clientpositive -qFileTest.clientPositive.batchSize = 30 +qFileTest.clientPositive.batchSize = 25 qFileTest.clientPositive.queryFilesProperty = qfile qFileTest.clientPositive.exclude = minimr qFileTest.clientPositive.groups.minimr = mainProperties.${minimr.query.files} @@ -80,9 +83,18 @@ qFileTest.miniMr.isolate = flaky # normal are tests that run in minimr mode via build-common.xml qFileTest.miniMr.groups.normal = mainProperties.${minimr.query.files} +qFileTest.encryptedCli.driver = TestEncryptedHDFSCliDriver +qFileTest.encryptedCli.directory = ql/src/test/queries/clientpositive +qFileTest.encryptedCli.batchSize = 6 +qFileTest.encryptedCli.queryFilesProperty = encrypted.query.files +qFileTest.encryptedCli.include = normal +qFileTest.encryptedCli.isolate = long +qFileTest.encryptedCli.groups.normal = mainProperties.${encrypted.query.files} +qFileTest.encryptedCli.groups.long = encryption_insert_partition_dynamic.q encryption_insert_partition_static.q + qFileTest.miniMrNegative.driver = TestNegativeMinimrCliDriver qFileTest.miniMrNegative.directory = ql/src/test/queries/clientnegative -qFileTest.miniMrNegative.batchSize = 1000 +qFileTest.miniMrNegative.batchSize = 150 qFileTest.miniMrNegative.queryFilesProperty = minimr.query.negative.files qFileTest.miniMrNegative.include = normal qFileTest.miniMrNegative.isolate = flaky @@ -91,14 +103,14 @@ qFileTest.miniMrNegative.groups.normal = mainProperties.${minimr.query.negative. qFileTest.clientNegative.driver = TestNegativeCliDriver qFileTest.clientNegative.directory = ql/src/test/queries/clientnegative -qFileTest.clientNegative.batchSize = 1000 +qFileTest.clientNegative.batchSize = 150 qFileTest.clientNegative.queryFilesProperty = qfile qFileTest.clientNegative.exclude = miniMrNormal failing # stats_aggregator_error_1.q fails in both negative client and minimr mode # Disable for HIVE-4941 as this tests runs via ant test #qFileTest.clientNegative.groups.failing = stats_aggregator_error_1.q # normal are run via minimr -qFileTest.clientNegative.groups.miniMrNormal = cluster_tasklog_retrieval.q minimr_broken_pipe.q mapreduce_stack_trace.q mapreduce_stack_trace_turnoff.q mapreduce_stack_trace_turnoff_hadoop20.q +qFileTest.clientNegative.groups.miniMrNormal = cluster_tasklog_retrieval.q minimr_broken_pipe.q mapreduce_stack_trace.q mapreduce_stack_trace_turnoff.q mapreduce_stack_trace_hadoop20.q mapreduce_stack_trace_turnoff_hadoop20.q qFileTest.hbasePositive.driver = TestHBaseCliDriver qFileTest.hbasePositive.directory = hbase-handler/src/test/queries/positive @@ -119,14 +131,21 @@ qFileTest.miniTez.groups.normal = mainProperties.${minitez.query.files} mainProp qFileTest.spark.driver = TestSparkCliDriver qFileTest.spark.directory = ql/src/test/queries/clientpositive -qFileTest.spark.batchSize = 15 +qFileTest.spark.batchSize = 30 qFileTest.spark.queryFilesProperty = qfile qFileTest.spark.include = normal qFileTest.spark.groups.normal = mainProperties.${spark.query.files} +qFileTest.miniSparkOnYarn.driver = TestMiniSparkOnYarnCliDriver +qFileTest.miniSparkOnYarn.directory = ql/src/test/queries/clientpositive +qFileTest.miniSparkOnYarn.batchSize = 20 +qFileTest.miniSparkOnYarn.queryFilesProperty = qfile +qFileTest.miniSparkOnYarn.include = normal +qFileTest.miniSparkOnYarn.groups.normal = mainProperties.${miniSparkOnYarn.query.files} + qFileTest.miniLlap.driver = TestMiniLlapCliDriver qFileTest.miniLlap.directory = ql/src/test/queries/clientpositive -qFileTest.miniLlap.batchSize = 15 +qFileTest.miniLlap.batchSize = 30 qFileTest.miniLlap.queryFilesProperty = qfile qFileTest.miniLlap.include = normal qFileTest.miniLlap.isolate = flaky
