You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/06/01 22:14:34 UTC
[ignite-teamcity-bot] 01/01: Merge branch 'master' into ignite-11880
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 b3ee3ec20aa69e65af8abe72a689a551e7c4056e
Merge: 890afaa 78f1b7b
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Sun Jun 2 01:14:23 2019 +0300
Merge branch 'master' into ignite-11880
# Conflicts:
# ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
README.md | 2 +-
build.gradle | 6 +
ignite-tc-helper-web/build.gradle | 3 +
.../java/org/apache/ignite/ci/HelperConfig.java | 38 +---
.../ignite/ci/IAnalyticsEnabledTeamcity.java | 2 +
.../apache/ignite/ci/IgnitePersistentTeamcity.java | 56 +++---
.../apache/ignite/ci/analysis/FullChainRunCtx.java | 4 +-
.../ignite/ci/analysis/IMultTestOccurrence.java | 2 +-
.../apache/ignite/ci/analysis/LogCheckTask.java | 2 +-
.../apache/ignite/ci/analysis/MultBuildRunCtx.java | 8 +-
.../ignite/ci/analysis/SingleBuildRunCtx.java | 17 +-
.../ignite/ci/analysis/TestCompactedMult.java | 2 +-
.../java/org/apache/ignite/ci/db/DbMigrations.java | 2 +-
.../java/org/apache/ignite/ci/db/Ignite1Init.java | 6 +-
.../org/apache/ignite/ci/db/Ignite2Configurer.java | 7 +-
.../org/apache/ignite/ci/di/IgniteTcBotModule.java | 3 +-
.../ignite/ci/di/MonitoredTaskInterceptor.java | 2 +-
.../ci/github/ignited/GitHubConnIgnitedImpl.java | 2 +-
.../ci/github/ignited/GitHubIgnitedProvImpl.java | 2 +-
.../ci/github/pure/GitHubCachingProvider.java | 2 +-
.../ci/github/pure/GitHubConnectionImpl.java | 4 +-
.../java/org/apache/ignite/ci/issue/Issue.java | 2 +-
.../ignite/ci/jira/ignited/JiraIgnitedModule.java | 4 +
.../ci/jira/ignited/JiraIgnitedProvider.java | 2 +-
.../ignite/ci/jira/ignited/JiraTicketDao.java | 2 +-
.../org/apache/ignite/ci/jira/package-info.java | 2 +-
.../java/org/apache/ignite/ci/jira/pure/Jira.java | 4 +-
.../ci/jira/pure/JiraIntegrationProvider.java | 2 +-
.../org/apache/ignite/ci/jobs/CheckQueueJob.java | 12 +-
.../org/apache/ignite/ci/logs/LogMsgToWarn.java | 2 +-
.../apache/ignite/ci/observer/BuildObserver.java | 2 +-
.../org/apache/ignite/ci/observer/BuildsInfo.java | 2 +-
.../apache/ignite/ci/observer/ObserverTask.java | 2 +-
.../runners/IgniteTeamcityHelperRunnerExample.java | 12 +-
.../ignite/ci/runners/RemoteClientTmpHelper.java | 6 +-
.../ci/tcbot/TcBotBusinessServicesModule.java | 5 +
.../ignite/ci/tcbot/chain/BuildChainProcessor.java | 157 +++++++++++-----
.../ignite/ci/tcbot/chain/PrChainsProcessor.java | 25 +--
.../tcbot/chain/TrackedBranchChainsProcessor.java | 11 +-
.../ignite/ci/tcbot/conf/BuildParameterSpec.java | 6 +-
.../apache/ignite/ci/tcbot/conf/ITcBotConfig.java | 7 +-
.../ci/tcbot/conf/LocalFilesBasedConfig.java | 4 +-
.../ignite/ci/tcbot/conf/ParameterValueSpec.java | 4 +-
.../ignite/ci/tcbot/conf/TcServerConfig.java | 4 +-
.../ignite/ci/tcbot/issue/IssueDetector.java | 4 +-
.../apache/ignite/ci/tcbot/issue/Notification.java | 2 +-
.../ci/tcbot/trends/MasterTrendsService.java | 6 +-
.../tcbot/visa/TcBotTriggerAndSignOffService.java | 10 +-
.../ci/teamcity/ignited/BuildRefCompacted.java | 4 +-
.../ci/teamcity/ignited/ITeamcityIgnited.java | 17 +-
.../teamcity/ignited/ITeamcityIgnitedProvider.java | 2 +-
.../ci/teamcity/ignited/IgniteStringCompactor.java | 6 +-
.../teamcity/ignited/TcIgnitedCachingProvider.java | 6 +-
.../ci/teamcity/ignited/TeamcityIgnitedImpl.java | 62 +++---
.../ci/teamcity/ignited/TeamcityIgnitedModule.java | 4 +-
.../ci/teamcity/ignited/buildref/BuildRefDao.java | 4 +-
.../ci/teamcity/ignited/buildref/BuildRefSync.java | 6 +-
.../ignited/buildtype/BuildTypeCompacted.java | 8 +-
.../teamcity/ignited/buildtype/BuildTypeDao.java | 4 +-
.../ignited/buildtype/BuildTypeRefCompacted.java | 2 +-
.../ignited/buildtype/BuildTypeRefDao.java | 2 +-
.../teamcity/ignited/buildtype/BuildTypeSync.java | 10 +-
.../ignited/buildtype/ParametersCompacted.java | 4 +-
.../buildtype/SnapshotDependencyCompacted.java | 2 +-
.../teamcity/ignited/change/ChangeCompacted.java | 2 +-
.../ci/teamcity/ignited/change/ChangeDao.java | 2 +-
.../ci/teamcity/ignited/change/ChangeSync.java | 8 +-
.../teamcity/ignited/change/RevisionCompacted.java | 4 +-
.../ignited/fatbuild/FatBuildCompacted.java | 32 ++--
.../ci/teamcity/ignited/fatbuild/FatBuildDao.java | 12 +-
.../ignited/fatbuild/ProactiveFatBuildSync.java | 20 +-
.../ignited/fatbuild/ProblemCompacted.java | 4 +-
.../ignited/fatbuild/StatisticsCompacted.java | 4 +-
.../teamcity/ignited/fatbuild/TestCompacted.java | 9 +-
.../ignite/ci/teamcity/ignited/mute/MuteDao.java | 4 +-
.../teamcity/ignited/mute/MuteInfoCompacted.java | 10 +-
.../teamcity/ignited/mute/MuteScopeCompacted.java | 6 +-
.../ignite/ci/teamcity/ignited/mute/MuteSync.java | 4 +-
.../ignited/runhist/RunHistCompactedDao.java | 2 +-
.../ci/teamcity/ignited/runhist/RunHistSync.java | 10 +-
.../ci/teamcity/restcached/ITcServerProvider.java | 3 +-
.../restcached/InitializingServerFactory.java | 2 +-
.../ci/teamcity/restcached/TcRestCachedModule.java | 4 +-
.../restcached/TcServerCachingProvider.java | 9 +-
.../org/apache/ignite/ci/user/TcHelperUser.java | 2 +-
.../java/org/apache/ignite/ci/util/FutureUtil.java | 2 +
.../java/org/apache/ignite/ci/util/ZipUtil.java | 5 +-
.../java/org/apache/ignite/ci/web/CtxListener.java | 2 +-
.../java/org/apache/ignite/ci/web/Launcher.java | 2 +-
.../apache/ignite/ci/web/TcApplicationResCfg.java | 2 +-
.../ignite/ci/web/auth/AuthenticationFilter.java | 6 +-
.../model/current/ChainAtServerCurrentStatus.java | 2 +-
.../ci/web/model/current/SuiteCurrentStatus.java | 6 +-
.../ignite/ci/web/model/current/TestFailure.java | 2 +-
.../ignite/ci/web/model/current/UpdateInfo.java | 11 +-
.../ignite/ci/web/model/long_running/LRTest.java | 2 +-
.../model/long_running/SuiteLRTestsSummary.java | 2 +-
.../web/model/trends/BuildStatisticsSummary.java | 14 +-
.../ignite/ci/web/model/trends/BuildsHistory.java | 3 +-
.../org/apache/ignite/ci/web/rest/GetBuildLog.java | 47 ++---
.../ignite/ci/web/rest/GetChainResultsAsHtml.java | 9 +-
.../ignite/ci/web/rest/build/CompareBuilds.java | 2 +-
.../ci/web/rest/build/GetBuildTestFailures.java | 9 +-
.../web/rest/exception/ExeptionsTraceLogger.java | 2 +-
...ava => ServiceUnauthorizedExceptionMapper.java} | 15 +-
.../org/apache/ignite/ci/web/rest/login/Login.java | 6 +-
.../ignite/ci/web/rest/login/UserService.java | 4 +-
.../long_running/BuildsLongRunningTestsReport.java | 2 +-
.../ignite/ci/web/rest/monitoring/HotSpot.java | 2 +-
.../rest/tracked/GetTrackedBranchTestResults.java | 2 +-
.../ignite/ci/web/rest/visa/TcBotVisaService.java | 1 -
.../ci/tcbot/chain/BuildChainProcessorTest.java | 18 +-
.../ci/tcbot/chain/MockBasedTcBotModule.java | 33 ++--
.../ci/tcbot/chain/PrChainsProcessorTest.java | 16 +-
.../ci/tcbot/chain/TrackedBranchProcessorTest.java | 2 +-
.../ignite/ci/tcbot/issue/IssueDetectorTest.java | 4 +-
.../ignited/IgnitedTcInMemoryIntegrationTest.java | 44 ++---
.../ci/teamcity/ignited/TeamcityIgnitedMock.java | 3 +-
.../ci/teamcity/pure/BuildHistoryEmulator.java | 6 +-
.../org/apache/ignite/ci/user/LoginAuthTest.java | 6 +-
settings.gradle | 5 +-
tcbot-common/build.gradle | 45 +++++
{tc-bot-server => tcbot-common}/header.txt | 0
.../tcbot/common/conf/IBuildParameterSpec.java | 13 +-
.../tcbot/common/conf/IParameterValueSpec.java | 12 +-
.../ignite/tcbot/common}/conf/ITcServerConfig.java | 22 ++-
.../tcbot/common/conf/ITcServerConfigSupplier.java | 10 +-
.../tcbot/common/conf}/TcBotSystemProperties.java | 2 +-
.../ignite/tcbot/common/conf/TcBotWorkDir.java | 46 +++++
.../tcbot/common/exeption}/ExceptionUtil.java | 7 +-
.../exeption/ServiceBadRequestException.java | 8 +-
.../common/exeption/ServiceConflictException.java | 6 +-
.../exeption}/ServiceUnauthorizedException.java | 16 +-
.../tcbot/common/interceptor}/AutoProfiling.java | 2 +-
.../ignite/tcbot/common}/util/Base64Util.java | 9 +-
.../apache/ignite/tcbot/common}/util/HttpUtil.java | 19 +-
.../ignite/tcbot/common}/util/ObjectInterner.java | 4 +-
.../apache/ignite/tcbot/common}/util/TimeUtil.java | 4 +-
{tc-bot-server => tcbot-server}/build.gradle | 4 +
{tc-bot-server => tcbot-server}/header.txt | 0
.../ignite/ci/TcBotIgniteServerLauncher.java | 4 +-
.../build.gradle | 24 +--
{tc-bot-server => tcbot-teamcity}/header.txt | 0
.../org/apache/ignite/tcservice}/ITeamcity.java | 24 +--
.../apache/ignite/tcservice}/ITeamcityConn.java | 32 ++--
.../tcservice}/IgniteTeamcityConnection.java | 209 ++++++---------------
.../ignite/tcservice}/TcRealConnectionModule.java | 13 +-
.../tcservice/http}/FileRecordingInputStream.java | 6 +-
.../tcservice/http}/ITeamcityHttpConnection.java | 7 +-
.../ignite/tcservice/http}/TeamcityRecorder.java | 12 +-
.../http}/TeamcityRecordingConnection.java | 4 +-
.../apache/ignite/tcservice/login}/ITcLogin.java | 4 +-
.../ignite/tcservice/login}/TcLoginImpl.java | 11 +-
.../ignite/tcservice/model}/ParameterType.java | 2 +-
.../apache/ignite/tcservice/model}/Properties.java | 2 +-
.../apache/ignite/tcservice/model}/Property.java | 2 +-
.../ignite/tcservice/model}/agent/Agent.java | 6 +-
.../tcservice/model}/agent/AgentPoolRef.java | 2 +-
.../ignite/tcservice/model}/agent/AgentRef.java | 4 +-
.../ignite/tcservice/model}/agent/AgentsRef.java | 2 +-
.../ignite/tcservice/model}/changes/Change.java | 11 +-
.../ignite/tcservice/model}/changes/ChangeRef.java | 8 +-
.../tcservice/model}/changes/ChangesList.java | 4 +-
.../tcservice/model}/changes/ChangesListRef.java | 4 +-
.../ignite/tcservice/model}/conf/BuildType.java | 4 +-
.../ignite/tcservice/model}/conf/Project.java | 2 +-
.../ignite/tcservice/model}/conf/ProjectsList.java | 9 +-
.../tcservice/model}/conf/bt/BuildTypeFull.java | 6 +-
.../tcservice/model}/conf/bt/Parameters.java | 7 +-
.../ignite/tcservice/model}/conf/bt/Property.java | 4 +-
.../model}/conf/bt/SnapshotDependencies.java | 2 +-
.../model}/conf/bt/SnapshotDependency.java | 4 +-
.../ignite/tcservice/model}/hist/BuildRef.java | 4 +-
.../ignite/tcservice/model}/hist/Builds.java | 2 +-
.../tcservice/model}/mute/MuteAssignment.java | 4 +-
.../ignite/tcservice/model}/mute/MuteInfo.java | 7 +-
.../ignite/tcservice/model}/mute/MuteScope.java | 6 +-
.../ignite/tcservice/model}/mute/MuteTarget.java | 4 +-
.../apache/ignite/tcservice/model}/mute/Mutes.java | 4 +-
.../tcservice/model}/result/AbstractRef.java | 2 +-
.../ignite/tcservice/model}/result/Build.java | 25 +--
.../tcservice/model}/result/Configurations.java | 5 +-
.../model}/result/ProblemOccurrencesRef.java | 2 +-
.../tcservice/model}/result/RelatedIssuesRef.java | 2 +-
.../tcservice/model}/result/StatisticsRef.java | 2 +-
.../model}/result/TestOccurrencesRef.java | 2 +-
.../ignite/tcservice/model}/result/Triggered.java | 6 +-
.../model}/result/problems/ProblemOccurrence.java | 6 +-
.../model}/result/problems/ProblemOccurrences.java | 6 +-
.../tcservice/model}/result/stat/Statistics.java | 5 +-
.../model}/result/tests/TestOccurrence.java | 2 +-
.../model}/result/tests/TestOccurrenceFull.java | 4 +-
.../model}/result/tests/TestOccurrences.java | 4 +-
.../model}/result/tests/TestOccurrencesFull.java | 4 +-
.../tcservice/model}/result/tests/TestRef.java | 4 +-
.../apache/ignite/tcservice/model}/user/User.java | 6 +-
.../ignite/tcservice/model}/user/UserRef.java | 2 +-
.../apache/ignite/tcservice/model}/user/Users.java | 2 +-
.../ignite/tcservice/model}/vcs/Revision.java | 2 +-
.../ignite/tcservice/model}/vcs/Revisions.java | 2 +-
.../tcservice/model}/vcs/VcsRootInstance.java | 2 +-
.../tcservice/util}/TcConnectionStaticLinker.java | 5 +-
.../org/apache/ignite/tcservice}/util/XmlUtil.java | 5 +-
203 files changed, 944 insertions(+), 926 deletions(-)
diff --cc ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Issue.java
index 367f055,00b0899..dda614c
--- 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,9 -23,8 +24,9 @@@ 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.ci.util.TimeUtil;
+ 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/user/TcHelperUser.java
index 5ae99dc,7e4e22d..990aac9
--- 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
@@@ -28,8 -27,9 +28,8 @@@ import javax.annotation.Nullable
import org.apache.ignite.ci.analysis.IVersionedEntity;
import org.apache.ignite.ci.db.Persisted;
import org.apache.ignite.ci.tcbot.conf.INotificationChannel;
- import org.apache.ignite.ci.tcmodel.user.User;
+ import org.apache.ignite.tcservice.model.user.User;
import org.apache.ignite.ci.util.CryptUtil;
-import org.jetbrains.annotations.Nullable;
import static javax.xml.bind.DatatypeConverter.printHexBinary;
diff --cc ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
index 9b5b06a,876cddb..3eacfa3
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
@@@ -224,8 -224,8 +224,8 @@@ import static org.apache.ignite.ci.util
runningBuildCount = suite.runningBuildCount();
queuedBuildCount = suite.queuedBuildCount();
- serverId = tcIgnited.serverId();
+ serverId = tcIgnited.serverCode();
- this.suiteId = suite.suiteId();
+ suiteId = suite.suiteId();
branchName = branchForLink(suite.branchName());
tags = suite.tags();