diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-10-12 15:25:49 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-10-12 15:25:49 +0200 |
| commit | bdecfddb7d9422698b8210733a26b5afe0788544 (patch) | |
| tree | ea7e797bf3a8e09840e7347ee6c4cd22fd066ef6 /controller-server/src | |
| parent | 12dd2cadeef21462abd81e14b05552a298319b4e (diff) | |
Filter out pull requests
Diffstat (limited to 'controller-server/src')
2 files changed, 4 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java index 948301929cf..c3f3773cde6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java @@ -8,6 +8,7 @@ import com.yahoo.component.Vtag; import com.yahoo.vespa.hosted.controller.api.integration.github.GitSha; import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.Controller; +import com.yahoo.vespa.hosted.controller.application.ApplicationList; import com.yahoo.vespa.hosted.controller.application.Deployment; import com.yahoo.vespa.hosted.controller.application.DeploymentJobs; import com.yahoo.vespa.hosted.controller.application.JobStatus; @@ -132,7 +133,7 @@ public class VersionStatus { versionMap.put(infrastructureVersion, DeploymentStatistics.empty(infrastructureVersion)); } - for (Application application : applications) { + for (Application application : ApplicationList.from(applications).notPullRequest().asList()) { DeploymentJobs jobs = application.deploymentJobs(); // Note that each version deployed on this application exists diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java index ce5533bd0bc..3208f4d09c6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java @@ -49,8 +49,8 @@ public class VespaVersion implements Comparable<VespaVersion> { .notFailing(); ApplicationList failingOnThis = ApplicationList.from(statistics.failing(), controller.applications()); ApplicationList all = ApplicationList.from(controller.applications().asList()) - .hasDeployment() - .notPullRequest(); + .hasDeployment() + .notPullRequest(); // 'broken' if any Canary fails if ( ! failingOnThis.with(UpgradePolicy.canary).isEmpty()) |