summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-04-09 16:02:16 +0200
committerJon Marius Venstad <venstad@gmail.com>2020-04-09 16:02:16 +0200
commit060fbf73c6ee944f6e1d79f40a31002a9f559196 (patch)
tree3a2577331e811a8bfc9ec73bd1c049f5cfd378e8 /controller-server
parenta5b22190b5b3617d626e2c9425ae32131bfbafcf (diff)
Hide manual jobs
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java4
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json5
2 files changed, 4 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
index f17b61ed01a..2e2f318a626 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
@@ -200,7 +200,9 @@ public class DeploymentApiHandler extends LoggingRequestHandler {
});
});
}
- JobType.allIn(controller.system()).stream().map(JobType::jobName).forEach(root.setArray("jobs")::addString);
+ JobType.allIn(controller.system()).stream()
+ .filter(job -> ! job.environment().isManuallyDeployed())
+ .map(JobType::jobName).forEach(root.setArray("jobs")::addString);
return new SlimeJsonResponse(slime);
}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
index 8a455dc6e78..dd953a3b6cf 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
@@ -393,9 +393,6 @@
"production-aws-us-west-2a",
"test-aws-us-west-2a",
"production-aws-us-east-1b",
- "test-aws-us-east-1b",
- "dev-us-east-1",
- "dev-aws-us-east-2a",
- "perf-us-east-3"
+ "test-aws-us-east-1b"
]
}