summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-08-30 20:36:56 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-08-30 20:36:56 +0200
commit4c2f36e789566df7bee404a1b79d809c8872045e (patch)
tree665736f96f8583ecb1e217fc6aad08871a626cb4 /controller-server
parent92431c81ef1b0c92918cf4e2c31a2ad5b15f5dfe (diff)
Running tests aren't pending
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
index 3369ffaaa2c..620a3514c87 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
@@ -211,6 +211,9 @@ class JobControllerApiHandlerHelper {
.forEach((versions, types) -> pending.addFirst(types));
for (List<JobType> productionTypes : pending) {
Versions versions = pendingProduction.get(productionTypes.get(0));
+ if (statusOf(controller, application.id(), type, versions).equals("running"))
+ continue;
+
runs++;
Cursor runObject = runArray.addObject();
runObject.setString("status", "pending");