summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2022-02-23 21:32:20 +0100
committerJon Marius Venstad <venstad@gmail.com>2022-02-23 21:32:20 +0100
commitc7741293749cbeb4ae7ad3f1f46dce5f7b88851f (patch)
treecfe742251a96d24813cf88cd1940ca188251986c /controller-server
parentc19a225a548bb0ac6651a4816e6718f0d1f17ad4 (diff)
Remove available versions "at" timestampp
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java2
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json1
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json14
3 files changed, 4 insertions, 13 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 0d64117a40f..8b5c21fd474 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
@@ -316,7 +316,6 @@ class JobControllerApiHandlerHelper {
Cursor availableObject = availableArray.addObject();
availableObject.setString("platform", available.versionNumber().toFullString());
- availableObject.setLong("at", available.committedAt().toEpochMilli());
}
toSlime(latestPlatformObject.setArray("blockers"), blockers.stream().filter(ChangeBlocker::blocksVersions));
}
@@ -339,7 +338,6 @@ class JobControllerApiHandlerHelper {
Cursor availableObject = availableArray.addObject();
toSlime(availableObject.setObject("application"), available);
- availableObject.setLong("at", available.buildTime().orElse(Instant.EPOCH).toEpochMilli());
}
toSlime(latestApplicationObject.setArray("blockers"), blockers.stream().filter(ChangeBlocker::blocksRevisions));
}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
index 96bb5fd6198..e3d238aaf1e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
@@ -25,7 +25,6 @@
"available": [
{
"platform": "7.1.0",
- "at": 0
}
],
"blockers": [
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json
index 03eefd19838..6c02c22fe50 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json
@@ -25,7 +25,6 @@
"available": [
{
"platform": "6.1.0",
- "at": "(ignore)"
}
],
"blockers": []
@@ -547,7 +546,6 @@
"available": [
{
"platform": "6.1.0",
- "at": "(ignore)"
}
],
"blockers": []
@@ -568,8 +566,7 @@
"compileVersion": "6.1.0",
"sourceUrl": "repository1/tree/commit1",
"commit": "commit1"
- },
- "at": 1000
+ }
},
{
"application": {
@@ -577,8 +574,7 @@
"compileVersion": "6.1.0",
"sourceUrl": "repository1/tree/commit1",
"commit": "commit1"
- },
- "at": 1000
+ }
},
{
"application": {
@@ -586,8 +582,7 @@
"compileVersion": "6.1.0",
"sourceUrl": "repository1/tree/commit1",
"commit": "commit1"
- },
- "at": 1000
+ }
},
{
"application": {
@@ -595,8 +590,7 @@
"compileVersion": "6.1.0",
"sourceUrl": "repository1/tree/commit1",
"commit": "commit1"
- },
- "at": 1000
+ }
}
],
"blockers": []