summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-04-28 12:17:21 +0200
committerJon Marius Venstad <venstad@gmail.com>2020-04-28 12:17:21 +0200
commit58a75b5d9ba635b028fb774d0aacbed6ea12fe56 (patch)
tree2f0ff473f999744001b610d9d055686a1ddd6dc5 /controller-server
parentb170fd6f48dce9a73911cb77c8c9718b6b181c90 (diff)
"application" and "platform"
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java2
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json30
2 files changed, 16 insertions, 16 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 894cca6f243..55fbe1cc231 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
@@ -193,7 +193,7 @@ public class DeploymentApiHandler extends LoggingRequestHandler {
.allMatch(versions -> versions.sourcePlatform()
.map(versions.targetPlatform()::equals)
.orElse(true))
- ? "revision" : "upgrade");
+ ? "application" : "platform");
}
});
Cursor allRunsObject = instanceObject.setObject("allRuns");
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 3213c537d13..4f544427c4d 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
@@ -41,16 +41,16 @@
{
"name": "system-test",
"coolingDownUntil": "(ignore)",
- "pending": "upgrade"
+ "pending": "platform"
},
{
"name": "staging-test",
"coolingDownUntil": "(ignore)",
- "pending": "upgrade"
+ "pending": "platform"
},
{
"name": "production-us-west-1",
- "pending": "upgrade"
+ "pending": "platform"
}
],
"allRuns": {
@@ -83,15 +83,15 @@
"jobs": [
{
"name": "system-test",
- "pending": "upgrade"
+ "pending": "platform"
},
{
"name": "staging-test",
- "pending": "upgrade"
+ "pending": "platform"
},
{
"name": "production-us-west-1",
- "pending": "upgrade"
+ "pending": "platform"
}
],
"allRuns": {
@@ -200,16 +200,16 @@
{
"name": "system-test",
"coolingDownUntil": "(ignore)",
- "pending": "upgrade"
+ "pending": "platform"
},
{
"name": "staging-test",
"coolingDownUntil": "(ignore)",
- "pending": "upgrade"
+ "pending": "platform"
},
{
"name": "production-us-west-1",
- "pending": "upgrade"
+ "pending": "platform"
}
],
"allRuns": {
@@ -279,15 +279,15 @@
{
"name": "system-test",
"coolingDownUntil": "(ignore)",
- "pending": "revision"
+ "pending": "application"
},
{
"name": "staging-test",
- "pending": "revision"
+ "pending": "application"
},
{
"name": "production-us-west-1",
- "pending": "revision"
+ "pending": "application"
}
],
"allRuns": {
@@ -337,15 +337,15 @@
"jobs": [
{
"name": "system-test",
- "pending": "upgrade"
+ "pending": "platform"
},
{
"name": "staging-test",
- "pending": "upgrade"
+ "pending": "platform"
},
{
"name": "production-us-west-1",
- "pending": "upgrade"
+ "pending": "platform"
}
],
"allRuns": {