diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2021-05-21 13:58:17 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2021-05-21 13:58:17 +0200 |
| commit | aa910f5ce233c86c3e6bdb7a136cd1f7673a77ee (patch) | |
| tree | d8d92bda39569305a3346e3cbfc08b4ff8e71f36 /controller-server | |
| parent | 5783df40a392b2c5d365bef8e5fd9cd1a717e2fb (diff) | |
Fix history badge
Diffstat (limited to 'controller-server')
2 files changed, 7 insertions, 8 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java index 2b3f954c2ef..4951f2ba33b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java @@ -111,13 +111,12 @@ public class Badges { Run lastTriggered = status.lastTriggered().get(); List<Run> runs = status.runs().descendingMap().values().stream() - .filter(Run::hasEnded) - .limit(length + (lastTriggered.hasEnded() ? 0 : 1)) - .collect(toList()); + .filter(Run::hasEnded) + .skip(1) + .limit(length + (lastTriggered.hasEnded() ? 0 : 1)) + .collect(toList()); - boolean isOk = runs.isEmpty() || runs.get(0).status() == RunStatus.success; - if ( ! lastTriggered.hasEnded()) - runs.remove(0); + boolean isOk = status.lastCompleted().map(run -> run.status() == RunStatus.success).orElse(true); text = lastTriggered.id().type().jobName(); textWidth = widthOf(text); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/history2.svg b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/history2.svg index 46797ee534d..73d65b08b69 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/history2.svg +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/history2.svg @@ -44,7 +44,7 @@ </clipPath> <g clip-path='url(#rounded)'> <rect x='653.26809109179' rx='3' width='8' height='20' fill='url(#shadow)'/> - <rect x='646.1879570885093' rx='3' width='13.080134003280707' height='20' fill='#bf103c'/> + <rect x='646.1879570885093' rx='3' width='13.080134003280707' height='20' fill='#00f244'/> <rect x='646.1879570885093' rx='3' width='13.080134003280707' height='20' fill='url(#shade)'/> <rect x='646.4043039211865' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='639.1078230852286' rx='3' width='13.296480835957981' height='20' fill='#bf103c'/> @@ -137,7 +137,7 @@ <rect x='306.2923447644306' rx='3' width='23.466284764430597' height='20' fill='#bf103c'/> <rect x='306.2923447644306' rx='3' width='23.466284764430597' height='20' fill='url(#shade)'/> <rect x='306.82606' rx='3' width='8' height='20' fill='url(#shadow)'/> - <rect x='288.82606' rx='3' width='24.0' height='20' fill='#00f244'/> + <rect x='288.82606' rx='3' width='24.0' height='20' fill='#bf103c'/> <rect x='288.82606' rx='3' width='24.0' height='20' fill='url(#shade)'/> <rect x='288.82606' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='163.18729000000002' rx='3' width='131.63876999999997' height='20' fill='#00f244'/> |
