diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-12-06 15:23:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 15:23:51 +0100 |
| commit | 9ec0be2f564255a5dedb3166075b5d05738171a8 (patch) | |
| tree | 49626f493599b9398edff4896ea5015475cb13cd | |
| parent | 1bfae09471539303fa587f7c103baf4eb1c04e48 (diff) | |
| parent | 0b0b5b9d58c17fe463f774abd45701d6c9a66bfb (diff) | |
Merge pull request #7894 from vespa-engine/jvenstad/allow-emergency-deployments-through-controller
Follow zone change further up in test
2 files changed, 3 insertions, 3 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 21640481e86..6782ae29037 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 @@ -418,7 +418,7 @@ class JobControllerApiHandlerHelper { Optional<Run> run = jobs.last(id, type).flatMap(last -> jobs.active(last.id())); if (run.isPresent()) { jobs.abort(run.get().id()); - responseObject.setString("message", "Aborting " + run); + responseObject.setString("message", "Aborting " + run.get().id()); } else responseObject.setString("message", "Nothing to abort."); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java index 4ced2ef06f6..a519aa8e97c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java @@ -266,7 +266,7 @@ public class ApplicationApiTest extends ControllerContainerTest { Optional.of(ApplicationVersion.from(BuildJob.defaultSourceRevision, BuildJob.defaultBuildNumber - 1)), true); - tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/corp-us-east-1/instance/default/", POST) + tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-central-1/instance/default/", POST) .data(entity) .userIdentity(HOSTED_VESPA_OPERATOR), "{\"error-code\":\"INTERNAL_SERVER_ERROR\",\"message\":\"NullPointerException\"}", @@ -277,7 +277,7 @@ public class ApplicationApiTest extends ControllerContainerTest { Optional.of(ApplicationVersion.from(BuildJob.defaultSourceRevision, BuildJob.defaultBuildNumber)), true); - tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/corp-us-east-1/instance/default/", POST) + tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-central-1/instance/default/", POST) .data(entity) .userIdentity(HOSTED_VESPA_OPERATOR), new File("deploy-result.json")); |