Skip to content

Commit a2a0e35

Browse files
committed
Revert "TW-84882: if collecting changes fails, still try to publish commit statuses to Space by using the unknown git SHA revision"
This reverts commit b370da8.
1 parent b370da8 commit a2a0e35

File tree

4 files changed

+2
-43
lines changed

4 files changed

+2
-43
lines changed

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/BaseCommitStatusPublisher.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package jetbrains.buildServer.commitPublisher;
1818

19-
import java.util.Collection;
20-
import java.util.Collections;
2119
import java.util.Map;
2220
import jetbrains.buildServer.serverSide.*;
2321
import jetbrains.buildServer.users.User;
@@ -105,12 +103,6 @@ public void setConnectionTimeout(int timeout) {
105103
myConnectionTimeout = timeout;
106104
}
107105

108-
@NotNull
109-
@Override
110-
public Collection<BuildRevision> getFallbackRevisions() {
111-
return Collections.emptyList();
112-
}
113-
114106
@Nullable
115107
public String getVcsRootId() {
116108
return myParams.get(Constants.VCS_ROOT_ID_PARAM);

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/CommitStatusPublisher.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package jetbrains.buildServer.commitPublisher;
1818

19-
import java.util.Collection;
2019
import jetbrains.buildServer.serverSide.*;
2120
import jetbrains.buildServer.users.User;
2221
import org.jetbrains.annotations.NotNull;
@@ -70,17 +69,6 @@ public interface CommitStatusPublisher {
7069

7170
void setConnectionTimeout(int timeout);
7271

73-
/**
74-
* Returns the <em>(VCS specific)</em> fallback revisions to be used if no {@link BuildRevision}s could be determined.
75-
* <p>
76-
* <em>Note:</em> Publishing statuses to an unknown / fallback revisions only makes sense in very limited use cases.
77-
* Currently only {@link jetbrains.buildServer.commitPublisher.space.SpacePublisher} supports this.
78-
* </p>
79-
*
80-
* @return empty collection if this publisher doesn't support fallback revisions
81-
*/
82-
@NotNull
83-
Collection<BuildRevision> getFallbackRevisions();
8472

8573
enum Event {
8674
STARTED("buildStarted", EventPriority.FIRST, true), FINISHED("buildFinished", true),

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/CommitStatusPublisherListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ private boolean shouldFailBuild(@NotNull SBuildType buildType) {
645645
private Collection<BuildRevision> getQueuedBuildRevisionForVote(@NotNull BuildType buildType,
646646
@NotNull CommitStatusPublisher publisher,
647647
@NotNull BuildPromotion buildPromotion) {
648-
if (buildPromotion.isFailedToCollectChanges()) return publisher.getFallbackRevisions();
648+
if (buildPromotion.isFailedToCollectChanges()) return Collections.emptyList();
649649

650650
if (!((BuildPromotionEx)buildPromotion).isChangeCollectingNeeded(false)) {
651651
return getBuildRevisionForVote(publisher, buildPromotion.getRevisions());
@@ -819,7 +819,7 @@ public RetryInfo publish(Event event, BuildRevision revision, CommitStatusPublis
819819

820820
@Override
821821
public Collection<BuildRevision> getRevisions(BuildType buildType, CommitStatusPublisher publisher) {
822-
if (buildPromotion.isFailedToCollectChanges()) return publisher.getFallbackRevisions();
822+
if (buildPromotion.isFailedToCollectChanges()) return Collections.emptyList();
823823
return getBuildRevisionForVote(publisher, build.getRevisions());
824824
}
825825
};

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/space/SpacePublisher.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import jetbrains.buildServer.serverSide.oauth.space.SpaceConnectDescriber;
3030
import jetbrains.buildServer.util.StringUtil;
3131
import jetbrains.buildServer.vcs.VcsModification;
32-
import jetbrains.buildServer.vcs.VcsRootInstance;
3332
import jetbrains.buildServer.vcshostings.http.HttpHelper;
3433
import org.apache.http.HttpHeaders;
3534
import org.apache.http.entity.ContentType;
@@ -40,7 +39,6 @@
4039

4140
public class SpacePublisher extends HttpBasedCommitStatusPublisher<SpaceBuildStatus> {
4241
private static final String UNKNOWN_BUILD_CONFIGURATION = "Unknown build configuration";
43-
private static final String UNKNWON_GIT_SHA = "0000000000000000000000000000000000000000";
4442

4543
private final SpaceConnectDescriber mySpaceConnector;
4644
private final Gson myGson = new Gson();
@@ -368,23 +366,4 @@ public void processResponse(HttpHelper.HttpResponse response) throws HttpPublish
368366
throw new HttpPublisherException(statusCode, response.getStatusText(), "HTTP response error: " + (responseContent != null ? responseContent : "<empty>"));
369367
}
370368
}
371-
372-
/**
373-
* Returns the <em>"unknown git SHA"</em> revision.
374-
* This revision can serve as a fallback.
375-
* Space is able to match safe-merge statuses by build ID.
376-
* See: TW-84882
377-
*
378-
* @return singleton collection of an artificial build revision pointing to {@link #UNKNWON_GIT_SHA}
379-
*/
380-
@NotNull
381-
@Override
382-
public Collection<BuildRevision> getFallbackRevisions() {
383-
final List<VcsRootInstance> vcsRootInstances = myBuildType.getVcsRootInstances();
384-
if (vcsRootInstances.isEmpty()) {
385-
LOG.warn("unable to construct fallback build revision for Space build " + LogUtil.describe(myBuildType) + ": no VCS root instances found");
386-
return super.getFallbackRevisions();
387-
}
388-
return Collections.singletonList(new BuildRevision(vcsRootInstances.get(0), UNKNWON_GIT_SHA, "", UNKNWON_GIT_SHA));
389-
}
390369
}

0 commit comments

Comments
 (0)