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/01/21 12:35:35 UTC
[ignite-teamcity-bot] branch ignite-10989-remove-old-rest updated:
IGNITE-10989: Triggering information saved for new builds.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10989-remove-old-rest
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10989-remove-old-rest by this push:
new 618f583 IGNITE-10989: Triggering information saved for new builds.
618f583 is described below
commit 618f583f09588e2cdab19e8ba43126f60ecfe05e
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Mon Jan 21 15:35:33 2019 +0300
IGNITE-10989: Triggering information saved for new builds.
---
.../org/apache/ignite/ci/jobs/CheckQueueJob.java | 3 +-
.../ci/teamcity/ignited/IStringCompactor.java | 4 +-
.../ignited/fatbuild/FatBuildCompacted.java | 50 +++++++++++++++
.../ignited/fatbuild/TriggeredCompacted.java | 72 ++++++++++++++++++++++
.../ignited/IgnitedTcInMemoryIntegrationTest.java | 13 ++++
5 files changed, 138 insertions(+), 4 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java
index 482cebe..5b1b584 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java
@@ -199,8 +199,7 @@ public class CheckQueueJob implements Runnable {
String login = user.username;
- if (selfLogin.equalsIgnoreCase(login)
- && Objects.equals(build.branchName, chain.branchForRest)) {
+ if (selfLogin.equalsIgnoreCase(login)) {
final String msg
= MessageFormat.format("Queued build {0} was early triggered " +
"(user {1}, branch {2}, suite {3})." +
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/IStringCompactor.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/IStringCompactor.java
index dfdc3b2..57e3c15 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/IStringCompactor.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/IStringCompactor.java
@@ -21,12 +21,12 @@ package org.apache.ignite.ci.teamcity.ignited;
*/
public interface IStringCompactor {
/**
- * @param val Value.
+ * @param val Value to be identified as integer.
*/
public int getStringId(String val);
/**
- * @param id Id.
+ * @param id Id of string from {@link #getStringId(String)}. Negative value implies <code>null</code>.
*/
public String getStringFromId(int id);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
index 91c8df4..4385305 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
@@ -26,10 +26,12 @@ import org.apache.ignite.ci.tcmodel.conf.BuildType;
import org.apache.ignite.ci.tcmodel.hist.BuildRef;
import org.apache.ignite.ci.tcmodel.result.Build;
import org.apache.ignite.ci.tcmodel.result.TestOccurrencesRef;
+import org.apache.ignite.ci.tcmodel.result.Triggered;
import org.apache.ignite.ci.tcmodel.result.problems.ProblemOccurrence;
import org.apache.ignite.ci.tcmodel.result.stat.Statistics;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrenceFull;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrencesFull;
+import org.apache.ignite.ci.tcmodel.user.User;
import org.apache.ignite.ci.teamcity.ignited.BuildRefCompacted;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.runhist.Invocation;
@@ -106,6 +108,8 @@ public class FatBuildCompacted extends BuildRefCompacted implements IVersionedEn
@Nullable private int changesIds[];
+ @Nullable private TriggeredCompacted triggered;
+
/** {@inheritDoc} */
@Override public int version() {
return _ver;
@@ -166,6 +170,28 @@ public class FatBuildCompacted extends BuildRefCompacted implements IVersionedEn
if (build.isFakeStub())
setFakeStub(true);
+
+ final Triggered trigXml = build.getTriggered();
+
+ if (trigXml != null) {
+ this.triggered = new TriggeredCompacted();
+
+ this.triggered.type = compactor.getStringId(trigXml.getType());
+
+ final User trigXmlUser = trigXml.getUser();
+
+ if (trigXmlUser != null) {
+ this.triggered.userId = Integer.valueOf(trigXmlUser.id);
+ this.triggered.userUsername = compactor.getStringId(trigXmlUser.username);
+ } else {
+ this.triggered.userId = -1;
+ this.triggered.userUsername = -1;
+ }
+
+ final BuildRef trigBuildRef = trigXml.getBuild();
+
+ this.triggered.buildId = trigBuildRef != null ? trigBuildRef.getId() : -1;
+ }
}
public FatBuildCompacted setFakeStub(boolean val) {
@@ -240,6 +266,29 @@ public class FatBuildCompacted extends BuildRefCompacted implements IVersionedEn
res.defaultBranch = getFlag(DEF_BR_F);
res.composite = getFlag(COMPOSITE_F);
+ if (triggered != null) {
+ final Triggered trigXml = new Triggered();
+
+ trigXml.setType(compactor.getStringFromId(triggered.type));
+ trigXml.setDate(res.queuedDate);
+
+ if (triggered.userId > 0) {
+ final User trigUser = new User();
+ trigUser.id = Integer.toString(triggered.userId);
+ trigUser.username = compactor.getStringFromId(triggered.userUsername);
+ trigXml.setUser(trigUser);
+ }
+
+
+ if (triggered.buildId > 0) {
+ final BuildRef trigBuild = new BuildRef();
+ trigBuild.setId(triggered.buildId);
+ trigXml.setBuild(trigBuild);
+ }
+
+ res.setTriggered(trigXml);
+ }
+
}
/**
@@ -482,6 +531,7 @@ public class FatBuildCompacted extends BuildRefCompacted implements IVersionedEn
.add("problems", problems)
.add("statistics", statistics)
.add("changesIds", changesIds)
+ .add("triggered", triggered)
.toString();
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TriggeredCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TriggeredCompacted.java
new file mode 100644
index 0000000..728615d
--- /dev/null
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TriggeredCompacted.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+package org.apache.ignite.ci.teamcity.ignited.fatbuild;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+
+/**
+ * Triggered build information type/date/user
+ */
+public class TriggeredCompacted {
+ /**
+ * Type of triggering, for example:
+ * "snapshotDependency", ""
+ */
+ public int type;
+
+ /**
+ * User ID by teamcity identification.
+ */
+ public int userId;
+
+ /**
+ * User entity: Username compacted string Id.
+ */
+ public int userUsername;
+
+ /**
+ * Build ID, filled for snapshotDependencies triggering.
+ */
+ public int buildId;
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ TriggeredCompacted that = (TriggeredCompacted) o;
+ return type == that.type &&
+ userId == that.userId &&
+ userUsername == that.userUsername &&
+ buildId == that.buildId;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(type, userId, userUsername, buildId);
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("type", type)
+ .add("userId", userId)
+ .add("userUsername", userUsername)
+ .add("buildId", buildId)
+ .toString();
+ }
+}
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
index e768ceb..6ca6a82 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
@@ -56,6 +56,7 @@ import org.apache.ignite.ci.tcmodel.hist.BuildRef;
import org.apache.ignite.ci.tcmodel.mute.MuteInfo;
import org.apache.ignite.ci.tcmodel.mute.Mutes;
import org.apache.ignite.ci.tcmodel.result.Build;
+import org.apache.ignite.ci.tcmodel.result.Triggered;
import org.apache.ignite.ci.tcmodel.result.problems.ProblemOccurrence;
import org.apache.ignite.ci.tcmodel.result.problems.ProblemOccurrences;
import org.apache.ignite.ci.tcmodel.result.stat.Statistics;
@@ -470,6 +471,18 @@ public class IgnitedTcInMemoryIntegrationTest {
assertEquals(refBuild.buildTypeId(), actBuild.buildTypeId());
assertEquals(refBuild.getStartDate(), actBuild.getStartDate());
assertEquals(refBuild.getFinishDate(), actBuild.getFinishDate());
+
+ final Triggered refTrig = refBuild.getTriggered();
+ final Triggered actTrig = actBuild.getTriggered();
+ assertNotNull(refTrig);
+ assertNotNull(actTrig);
+
+ assertNotNull(refTrig.getUser());
+ assertNotNull(actTrig.getUser());
+
+ assertEquals(refTrig.getUser().username, actTrig.getUser().username);
+ assertEquals(refTrig.getBuild().getId(), actTrig.getBuild().getId());
+
BuildType refBt = refBuild.getBuildType();
BuildType actBt = actBuild.getBuildType();
assertEquals(refBt.getName(), actBt.getName());