This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-11880 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit 168f66d48a7d7a01ec5bdb68380a3f057478bae3 Merge: 710e5ac c147340 Author: Dmitriy Pavlov <[email protected]> AuthorDate: Sun Jun 2 18:16:44 2019 +0300 Merge branch 'master' into ignite-11880 # Conflicts: # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Issue.java # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/issue/IssueDetector.java # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/TcHelperUser.java build.gradle | 4 +- tcbot-teamcity/header.txt => header.txt | 0 ignite-tc-helper-web/build.gradle | 6 +- ignite-tc-helper-web/header.txt | 14 -- .../apache/ignite/ci/IgnitePersistentTeamcity.java | 265 --------------------- .../ignite/ci/analysis/IMultTestOccurrence.java | 2 +- .../apache/ignite/ci/analysis/MultBuildRunCtx.java | 51 ++-- .../ignite/ci/analysis/SingleBuildRunCtx.java | 26 +- .../apache/ignite/ci/analysis/SuiteInBranch.java | 75 ------ .../ignite/ci/analysis/TestCompactedMult.java | 4 +- .../apache/ignite/ci/analysis/TestInBranch.java | 71 ------ .../java/org/apache/ignite/ci/db/DbMigrations.java | 247 ++++++------------- .../java/org/apache/ignite/ci/db/Ignite1Init.java | 11 +- .../java/org/apache/ignite/ci/db/TcHelperDb.java | 26 +- .../org/apache/ignite/ci/di/IgniteTcBotModule.java | 10 +- .../ignite/ci/di/MonitoredTaskInterceptor.java | 1 + .../ignite/ci/di/cache/GuavaCachedInterceptor.java | 1 + .../ignite/ci/di/cache/GuavaCachedModule.java | 1 + .../ignite/ci/di/scheduler/SchedulerModule.java | 1 + .../ignite/ci/di/scheduler/TcBotScheduler.java | 3 +- .../org/apache/ignite/ci/github/GitHubBranch.java | 2 +- .../apache/ignite/ci/github/GitHubBranchKey.java | 2 +- .../apache/ignite/ci/github/GitHubBranchShort.java | 2 +- .../org/apache/ignite/ci/github/GitHubCommit.java | 2 +- .../org/apache/ignite/ci/github/GitHubUser.java | 2 +- .../org/apache/ignite/ci/github/PullRequest.java | 5 +- .../ci/github/ignited/GitHubConnIgnitedImpl.java | 4 +- .../org/apache/ignite/ci/issue/EventTemplate.java | 4 +- .../org/apache/ignite/ci/issue/EventTemplates.java | 8 +- .../java/org/apache/ignite/ci/issue/Issue.java | 2 +- .../java/org/apache/ignite/ci/issue/IssueKey.java | 2 +- .../apache/ignite/ci/jira/ignited/JiraIgnited.java | 2 +- .../ignite/ci/jira/ignited/JiraTicketDao.java | 4 +- .../ignite/ci/jira/ignited/JiraTicketSync.java | 6 +- .../ignite/ci/jira/ignited/TicketCompacted.java | 2 +- .../org/apache/ignite/ci/jobs/CheckQueueJob.java | 14 +- .../apache/ignite/ci/observer/BuildObserver.java | 14 +- .../org/apache/ignite/ci/observer/BuildsInfo.java | 10 +- .../ignite/ci/observer/CompactBuildsInfo.java | 2 +- .../apache/ignite/ci/observer/ObserverTask.java | 12 +- .../runners/IgniteTeamcityHelperRunnerExample.java | 6 +- .../ignite/ci/runners/RemoteClientTmpHelper.java | 14 +- .../org/apache/ignite/ci/tcbot/ITcBotBgAuth.java | 6 +- .../apache/ignite/ci/tcbot/TcBotBgAuthImpl.java | 8 +- .../ci/tcbot/builds/CompareBuildsService.java | 10 +- .../ignite/ci/tcbot/chain/BuildChainProcessor.java | 121 ++-------- .../ignite/ci/tcbot/chain/PrChainsProcessor.java | 29 +-- .../tcbot/chain/TrackedBranchChainsProcessor.java | 17 +- .../ci/tcbot/conf/LocalFilesBasedConfig.java | 2 +- .../ignite/ci/tcbot/issue/IssueDetector.java | 37 ++- .../ci/tcbot/trends/MasterTrendsService.java | 16 +- .../ignite/ci/tcbot/visa/BranchTicketMatcher.java | 2 +- .../tcbot/visa/TcBotTriggerAndSignOffService.java | 32 +-- .../ci/teamcity/restcached/ITcServerProvider.java | 34 --- .../restcached/InitializingServerFactory.java | 48 ---- .../ci/teamcity/restcached/TcRestCachedModule.java | 51 ---- .../restcached/TcServerCachingProvider.java | 69 ------ ...{ICredentialsProv.java => ITcBotUserCreds.java} | 27 +-- .../org/apache/ignite/ci/user/TcHelperUser.java | 5 +- .../org/apache/ignite/ci/user/UserSession.java | 2 +- .../java/org/apache/ignite/ci/util/ZipUtil.java | 72 ------ .../java/org/apache/ignite/ci/web/CtxListener.java | 15 +- .../apache/ignite/ci/web/TcApplicationResCfg.java | 4 +- .../ignite/ci/web/auth/AuthenticationFilter.java | 8 +- .../ci/web/model/CompactContributionKey.java | 2 +- .../apache/ignite/ci/web/model/CompactVisa.java | 2 +- .../ignite/ci/web/model/CompactVisaRequest.java | 2 +- .../ignite/ci/web/model/ContributionKey.java | 2 +- .../org/apache/ignite/ci/web/model/Version.java | 2 +- .../model/current/ChainAtServerCurrentStatus.java | 4 +- .../ci/web/model/current/SuiteCurrentStatus.java | 23 +- .../ignite/ci/web/model/current/TestFailure.java | 17 +- .../ignite/ci/web/model/hist/TestHistory.java | 2 +- .../ci/web/model/hist/VisasHistoryStorage.java | 2 +- .../web/model/trends/BuildStatisticsSummary.java | 2 +- .../ignite/ci/web/model/trends/BuildsHistory.java | 2 +- .../org/apache/ignite/ci/web/rest/GetBuildLog.java | 24 +- .../ignite/ci/web/rest/GetChainResultsAsHtml.java | 15 +- .../ignite/ci/web/rest/GetTrackedBranches.java | 10 +- .../apache/ignite/ci/web/rest/TriggerBuilds.java | 10 +- .../ignite/ci/web/rest/build/CompareBuilds.java | 6 +- .../ci/web/rest/build/GetBuildTestFailures.java | 19 +- ...on.java => ServiceStartingExceptionMapper.java} | 17 +- .../ServiceUnauthorizedExceptionMapper.java | 2 - .../org/apache/ignite/ci/web/rest/login/Login.java | 2 +- .../ignite/ci/web/rest/login/UserService.java | 16 +- .../long_running/BuildsLongRunningTestsReport.java | 4 +- .../ignite/ci/web/rest/pr/GetPrTestFailures.java | 6 +- .../rest/tracked/GetTrackedBranchTestResults.java | 14 +- .../ignite/ci/web/rest/visa/TcBotVisaService.java | 12 +- .../org/apache/ignite/ci/di/DiContextTest.java | 9 +- .../org/apache/ignite/ci/di/cache/CachingTest.java | 2 + .../ci/di/scheduler/DirectExecNoWaitScheduler.java | 4 +- .../ci/tcbot/chain/BuildChainProcessorTest.java | 12 +- .../ci/tcbot/chain/MockBasedTcBotModule.java | 14 +- .../ci/tcbot/chain/PrChainsProcessorTest.java | 12 +- .../ci/tcbot/chain/TrackedBranchProcessorTest.java | 10 +- .../ignite/ci/tcbot/issue/IssueDetectorTest.java | 10 +- .../ci/teamcity/ignited/BuildKeyUnitTest.java | 3 +- .../teamcity/ignited/InMemoryStringCompactor.java | 2 + .../ci/teamcity/ignited/TeamcityIgnitedMock.java | 15 +- .../ignited/TeamcityIgnitedProviderMock.java | 17 +- .../org/apache/ignite/ci/user/LoginAuthTest.java | 2 +- .../IgnitedTcInMemoryIntegrationTest.java | 106 ++++----- jetty-launcher/header.txt | 14 -- settings.gradle | 1 + tcbot-common/header.txt | 14 -- .../tcbot/common/exeption/ExceptionUtil.java | 16 +- .../common/exeption/ServicesStartingException.java | 17 +- .../tcbot/common/interceptor}/GuavaCached.java | 4 +- .../tcbot/common/interceptor}/MonitoredTask.java | 2 +- .../apache/ignite/tcbot/common/util/HttpUtil.java | 12 +- .../ignite/tcbot/common}/util/NumberUtil.java | 2 +- .../build.gradle | 5 +- .../ci/tcbot/common/StringFieldCompacted.java | 29 ++- .../ci/teamcity/ignited/IgniteStringCompactor.java | 48 ++-- .../ignite/tcbot/persistence/CacheConfigs.java | 37 ++- .../tcbot/persistence}/IStringCompactor.java | 2 +- .../tcbot/persistence}/IVersionedEntity.java | 2 +- .../tcbot/persistence}/IgniteStringCompactor.java | 73 ++---- .../ignite/tcbot/persistence}/Persisted.java | 2 +- .../tcbot/persistence/TcBotPersistenceModule.java | 13 +- .../tcbot/persistence}/scheduler/IScheduler.java | 5 +- tcbot-server/README.md | 1 + tcbot-server/header.txt | 14 -- tcbot-teamcity-ignited/README.md | 5 + tcbot-teamcity-ignited/build.gradle | 2 +- .../ci/teamcity/ignited/BuildRefCompacted.java | 12 +- .../ignited/buildcondition/BuildCondition.java | 0 .../buildcondition/BuildConditionCompacted.java | 4 +- .../ignited/buildcondition/BuildConditionDao.java | 4 +- .../ignited/buildtype/BuildTypeCompacted.java | 12 +- .../teamcity/ignited/buildtype/BuildTypeDao.java | 14 +- .../ignited/buildtype/BuildTypeRefCompacted.java | 14 +- .../ignited/buildtype/BuildTypeRefDao.java | 14 +- .../teamcity/ignited/buildtype/BuildTypeSync.java | 11 +- .../ignited/buildtype/ParametersCompacted.java | 5 +- .../buildtype/SnapshotDependencyCompacted.java | 2 +- .../teamcity/ignited/change/ChangeCompacted.java | 8 +- .../ci/teamcity/ignited/change/ChangeDao.java | 9 +- .../ci/teamcity/ignited/change/ChangeSync.java | 6 +- .../teamcity/ignited/change/RevisionCompacted.java | 6 +- .../ignited/fatbuild/FatBuildCompacted.java | 15 +- .../ci/teamcity/ignited/fatbuild/FatBuildDao.java | 14 +- .../ignited/fatbuild/ProactiveFatBuildSync.java | 22 +- .../ignited/fatbuild/ProblemCompacted.java | 2 +- .../ignited/fatbuild/StatisticsCompacted.java | 5 +- .../teamcity/ignited/fatbuild/TestCompacted.java | 9 +- .../ignited/fatbuild/TriggeredCompacted.java | 0 .../ignite/ci/teamcity/ignited/mute/MuteDao.java | 6 +- .../teamcity/ignited/mute/MuteInfoCompacted.java | 2 +- .../teamcity/ignited/mute/MuteScopeCompacted.java | 2 +- .../ignite/ci/teamcity/ignited/mute/MuteSync.java | 5 +- .../ci/teamcity/ignited/runhist/Invocation.java | 5 +- .../teamcity/ignited/runhist/InvocationData.java | 9 +- .../teamcity/ignited/runhist/RunHistCompacted.java | 13 +- .../ci/teamcity/ignited/runhist/RunHistKey.java | 2 + .../apache/ignite/tcignited}/ITeamcityIgnited.java | 23 +- .../tcignited}/ITeamcityIgnitedProvider.java | 4 +- .../org/apache/ignite/tcignited}/SyncMode.java | 2 +- .../tcignited}/TcIgnitedCachingProvider.java | 33 +-- .../ignite/tcignited}/TeamcityIgnitedImpl.java | 63 ++--- .../ignite/tcignited}/TeamcityIgnitedModule.java | 33 +-- .../tcignited/buildlog/BuildLogCheckResultDao.java | 61 +++++ .../tcignited/buildlog/BuildLogProcessor.java | 138 +++++++++++ .../buildlog/BuildLogProcessorModule.java | 11 +- .../tcignited/buildlog}/BuildLogStreamChecker.java | 9 +- .../tcignited/buildlog/IBuildLogProcessor.java | 18 +- .../ignite/tcignited/buildlog}/ILineHandler.java | 2 +- .../ignite/tcignited/buildlog/ILogCheckResult.java | 27 +-- .../tcignited/buildlog}/ILogProductSpecific.java | 2 +- .../tcignited/buildlog/ITestLogCheckResult.java | 22 +- .../buildlog/LogCheckResultCompacted.java | 85 ++++--- .../ignite/tcignited/buildlog}/LogCheckTask.java | 34 +-- .../tcignited/buildlog}/LogIgniteSpecific.java | 2 +- .../ignite/tcignited/buildlog}/LogMsgToWarn.java | 2 +- .../ignite/tcignited/buildlog}/LogsAnalyzer.java | 2 +- .../buildlog/TestLogCheckResultCompacted.java | 34 +-- .../ignite/tcignited/buildlog}/TestLogHandler.java | 88 ++----- .../buildlog}/ThreadDumpInMemoryHandler.java | 3 +- .../ignite/tcignited}/buildref/BuildRefDao.java | 19 +- .../ignite/tcignited}/buildref/BuildRefSync.java | 10 +- .../ignite/tcignited/creds}/ICredentialsProv.java | 17 +- .../ignite/tcignited/history}/ChangesState.java | 2 +- .../ignite/tcignited/history/IEventTemplate.java | 13 +- .../ignite/tcignited/history}/IRunHistory.java | 5 +- .../apache/ignite/tcignited/history}/IRunStat.java | 2 +- .../tcignited/history}/RunHistCompactedDao.java | 27 ++- .../ignite/tcignited/history}/RunHistSync.java | 42 ++-- .../ignite/tcignited/history}/RunStatus.java | 2 +- tcbot-teamcity/README.md | 5 +- .../org/apache/ignite/tcservice/ITeamcityConn.java | 15 ++ ...nection.java => TeamcityServiceConnection.java} | 64 ++--- .../apache/ignite/tcservice/login/TcLoginImpl.java | 6 +- .../tcservice/util/TcConnectionStaticLinker.java | 6 +- 195 files changed, 1388 insertions(+), 2089 deletions(-) diff --cc ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Issue.java index dda614c,ed80fa0..05236a0 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Issue.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Issue.java @@@ -24,8 -23,7 +24,8 @@@ import java.util.Iterator import java.util.List; import java.util.Set; import java.util.TreeSet; +import javax.annotation.Nonnull; - import org.apache.ignite.ci.db.Persisted; + import org.apache.ignite.tcbot.persistence.Persisted; import org.apache.ignite.tcbot.common.util.TimeUtil; import org.jetbrains.annotations.Nullable; diff --cc ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/issue/IssueDetector.java index bc611a5,c27af80..373aa0d --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/issue/IssueDetector.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/issue/IssueDetector.java @@@ -31,13 -30,11 +31,12 @@@ import java.util.concurrent.ScheduledEx import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.Nonnull; import javax.inject.Inject; import javax.inject.Provider; - import org.apache.ignite.ci.analysis.SuiteInBranch; - import org.apache.ignite.ci.analysis.TestInBranch; + import org.apache.ignite.tcbot.common.interceptor.AutoProfiling; - import org.apache.ignite.ci.di.MonitoredTask; + import org.apache.ignite.tcbot.common.interceptor.MonitoredTask; import org.apache.ignite.ci.issue.EventTemplate; import org.apache.ignite.ci.issue.EventTemplates; import org.apache.ignite.ci.issue.Issue; @@@ -375,13 -361,10 +372,11 @@@ public class IssueDetector String srvId, String normalizeBranch, TestFailure testFailure, - String trackedBranch) { + String trackedBranch, + @Nonnull Set<String> suiteTags) { - String name = testFailure.name; - TestInBranch testInBranch = new TestInBranch(name, normalizeBranch); - IRunHistory runStat = tcIgnited.getTestRunHist(testInBranch); + IRunHistory runStat = tcIgnited.getTestRunHist(name, normalizeBranch); if (runStat == null) return false; diff --cc ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/TcHelperUser.java index 990aac9,39b9706..f79cdd1 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/TcHelperUser.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/TcHelperUser.java @@@ -24,9 -24,9 +24,10 @@@ import java.util.LinkedHashSet import java.util.List; import java.util.Set; import java.util.TreeSet; + +import javax.annotation.Nullable; - import org.apache.ignite.ci.analysis.IVersionedEntity; - import org.apache.ignite.ci.db.Persisted; + import org.apache.ignite.tcbot.persistence.IVersionedEntity; + import org.apache.ignite.tcbot.persistence.Persisted; import org.apache.ignite.ci.tcbot.conf.INotificationChannel; import org.apache.ignite.tcservice.model.user.User; import org.apache.ignite.ci.util.CryptUtil;
