diff options
Diffstat (limited to 'controller-server/src/test')
6 files changed, 184 insertions, 376 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java index ed7ae12168f..9b0706d184f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java @@ -201,11 +201,11 @@ public class ApplicationPackageBuilder { xml.append("'/>\n"); } xml.append(notifications); + xml.append(blockChange); if (explicitSystemTest) xml.append(" <test />\n"); if (explicitStagingTest) xml.append(" <staging />\n"); - xml.append(blockChange); xml.append(" <"); xml.append(environment.value()); if (globalServiceId != null) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java index 8ecdd63fa8f..db07aff34e5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.controller.deployment; import com.google.common.collect.ImmutableList; import com.yahoo.component.Version; import com.yahoo.config.application.api.DeploymentSpec; -import com.yahoo.config.provision.AthenzDomain; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.SystemName; @@ -487,10 +486,11 @@ public class InternalStepRunnerTest { @Test public void generates_correct_services_xml_test() { - assertFile("test_runner_services.xml-cd", new String(InternalStepRunner.servicesXml(AthenzDomain.from("vespa.vespa.cd"), - true, - false, - new NodeResources(2, 12, 75, 1, NodeResources.DiskSpeed.fast, NodeResources.StorageType.local)))); + assertFile("test_runner_services.xml-cd", + new String(InternalStepRunner.servicesXml( + true, + false, + new NodeResources(2, 12, 75, 1, NodeResources.DiskSpeed.fast, NodeResources.StorageType.local)))); } private void assertFile(String resourceName, String actualContent) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java index 1c96f46dd31..186534dd288 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java @@ -5,12 +5,15 @@ import com.yahoo.component.Version; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions; +import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException; import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationVersion; import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType; import com.yahoo.vespa.hosted.controller.application.ApplicationPackage; import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder; import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester; +import com.yahoo.vespa.hosted.controller.deployment.InternalStepRunner; +import com.yahoo.vespa.hosted.controller.deployment.RunStatus; import org.json.JSONException; import org.json.JSONObject; import org.junit.Test; @@ -23,7 +26,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.time.Duration; import java.time.Instant; -import java.util.Date; import java.util.Optional; import static com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException.ErrorCode.INVALID_APPLICATION_PACKAGE; @@ -35,10 +37,13 @@ import static com.yahoo.vespa.hosted.controller.api.integration.deployment.JobTy import static com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType.stagingTest; import static com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType.systemTest; import static com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType.testUsCentral1; +import static com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterCloud.Status.FAILURE; import static com.yahoo.vespa.hosted.controller.deployment.DeploymentContext.applicationPackage; import static com.yahoo.vespa.hosted.controller.deployment.RunStatus.deploymentFailed; +import static com.yahoo.vespa.hosted.controller.deployment.RunStatus.error; import static com.yahoo.vespa.hosted.controller.deployment.RunStatus.installationFailed; import static com.yahoo.vespa.hosted.controller.deployment.RunStatus.running; +import static com.yahoo.vespa.hosted.controller.deployment.RunStatus.testFailure; import static org.junit.Assert.assertEquals; /** @@ -51,9 +56,6 @@ public class JobControllerApiHandlerHelperTest { public void testResponses() { ApplicationPackage applicationPackage = new ApplicationPackageBuilder() .stagingTest() - .blockChange(true, true, "mon,tue", "7-13", "UTC") - .blockChange(false, true, "sun", "0-23", "CET") - .blockChange(true, false, "fri-sat", "8", "America/Los_Angeles") .region("us-central-1") .test("us-central-1") .parallel("us-west-1", "us-east-3") @@ -137,6 +139,7 @@ public class JobControllerApiHandlerHelperTest { userApp.runJob(devAwsUsEast2a, applicationPackage); assertResponse(JobControllerApiHandlerHelper.runResponse(tester.jobs().runs(userApp.instanceId(), devAwsUsEast2a), URI.create("https://some.url:43/root")), "dev-aws-us-east-2a-runs.json"); assertResponse(JobControllerApiHandlerHelper.jobTypeResponse(tester.controller(), userApp.instanceId(), URI.create("https://some.url:43/root/")), "overview-user-instance.json"); + assertResponse(JobControllerApiHandlerHelper.overviewResponse(tester.controller(), app.application().id(), URI.create("https://some.url:43/root/")), "deployment-overview-2.json"); } 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 de88f914d44..a8be282deaf 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 @@ -6,123 +6,19 @@ "type": "instance", "dependencies": [], "declared": true, - "instance": "default", - "readyAt": 0, - "deploying": { - "application": { - "build": 3, - "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" - } - }, - "latestVersions": { - "platform": { - "platform": "7.1.0", - "at": 0, - "upgrade": true, - "blockers": [ - { - "days": [ - "Mon", - "Tue" - ], - "hours": [ - 7, - 8, - 9, - 10, - 11, - 12, - 13 - ], - "zone": "UTC" - }, - { - "days": [ - "Sun" - ], - "hours": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23 - ], - "zone": "CET" - } - ] - }, - "application": { - "application": { - "build": 3, - "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" - }, - "at": 1000, - "upgrade": true, - "blockers": [ - { - "days": [ - "Mon", - "Tue" - ], - "hours": [ - 7, - 8, - 9, - 10, - 11, - 12, - 13 - ], - "zone": "UTC" - }, - { - "days": [ - "Fri", - "Sat" - ], - "hours": [ - 8 - ], - "zone": "America/Los_Angeles" - } - ] - } - } + "instance": "default" }, { "type": "test", "dependencies": [], "declared": false, "instance": "default", - "readyAt": 0, "jobName": "system-test", "url": "https://some.url:43/instance/default/job/system-test", "environment": "test", "region": "test.us-east-1", "toRun": [], + "readyAt": 0, "runs": [ { "id": 3, @@ -133,17 +29,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 3, + "id": 3, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -198,17 +94,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -263,10 +159,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -319,9 +215,6 @@ "dependencies": [], "declared": true, "instance": "default", - "readyAt": 4353000, - "delayedUntil": 4353000, - "coolingDownUntil": 4353000, "jobName": "staging-test", "url": "https://some.url:43/instance/default/job/staging-test", "environment": "staging", @@ -331,21 +224,24 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 3, + "id": 3, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } } } ], + "readyAt": 4353000, + "delayedUntil": 4353000, + "coolingDownUntil": 4353000, "runs": [ { "id": 5, @@ -356,17 +252,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 3, + "id": 3, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -437,17 +333,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 3, + "id": 3, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -518,17 +414,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 3, + "id": 3, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -599,17 +495,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -680,10 +576,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -755,19 +651,19 @@ ], "declared": true, "instance": "default", - "readyAt": 3603000, "jobName": "production-us-central-1", "url": "https://some.url:43/instance/default/job/production-us-central-1", "environment": "prod", "region": "prod.us-central-1", "currentPlatform": "6.1.0", "currentApplication": { - "build": 3, + "id": 3, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "toRun": [], + "readyAt": 3603000, "runs": [ { "id": 3, @@ -777,17 +673,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 3, + "id": 3, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -814,17 +710,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -851,10 +747,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -890,17 +786,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 3, + "id": 3, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 3, + "id": 3, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } } } @@ -915,17 +811,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -964,17 +860,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -1019,27 +915,27 @@ "region": "prod.us-west-1", "currentPlatform": "6.1.0", "currentApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "toRun": [ { "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 3, + "id": 3, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } } } @@ -1054,17 +950,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -1091,10 +987,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -1127,27 +1023,27 @@ "region": "prod.us-east-3", "currentPlatform": "6.1.0", "currentApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "toRun": [ { "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 3, + "id": 3, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } } } @@ -1162,17 +1058,17 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 2, + "id": 2, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" }, "sourcePlatform": "6.1.0", "sourceApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -1199,10 +1095,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ 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 e75ebc923bd..027cca5dad2 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 @@ -6,47 +6,19 @@ "type": "instance", "dependencies": [], "declared": true, - "instance": "instance1", - "readyAt": 0, - "deploying": { - "application": { - "build": 4, - "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" - } - }, - "latestVersions": { - "platform": { - "platform": "6.1.0", - "at": "(ignore)", - "upgrade": false, - "blockers": [] - }, - "application": { - "application": { - "build": 4, - "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" - }, - "at": 1000, - "upgrade": false, - "blockers": [] - } - } + "instance": "instance1" }, { "type": "test", "dependencies": [], "declared": false, "instance": "instance1", - "readyAt": 0, "jobName": "system-test", "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/system-test", "environment": "test", "region": "test.us-east-1", "toRun": [], + "readyAt": 0, "runs": [ { "id": 2, @@ -56,10 +28,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 4, + "id": 4, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -114,10 +86,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -170,12 +142,12 @@ "dependencies": [], "declared": false, "instance": "instance1", - "readyAt": 0, "jobName": "staging-test", "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/staging-test", "environment": "staging", "region": "staging.us-east-3", "toRun": [], + "readyAt": 0, "runs": [ { "id": 2, @@ -185,10 +157,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 4, + "id": 4, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -259,10 +231,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -342,10 +314,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 4, + "id": 4, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } } } @@ -360,10 +332,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -399,10 +371,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 4, + "id": 4, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } } } @@ -416,9 +388,9 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 1, - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "id": 1, + "commit": "commit1", + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -454,10 +426,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 4, + "id": 4, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } } } @@ -471,10 +443,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 1, + "id": 1, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } }, "steps": [ @@ -501,39 +473,19 @@ 5 ], "declared": true, - "instance": "instance2", - "deploying": {}, - "latestVersions": { - "platform": { - "platform": "6.1.0", - "at": "(ignore)", - "upgrade": false, - "blockers": [] - }, - "application": { - "application": { - "build": 4, - "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" - }, - "at": 1000, - "upgrade": false, - "blockers": [] - } - } + "instance": "instance2" }, { "type": "test", "dependencies": [], "declared": false, "instance": "instance2", - "readyAt": 0, "jobName": "system-test", "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance2/job/system-test", "environment": "test", "region": "test.us-east-1", "toRun": [], + "readyAt": 0, "runs": [] }, { @@ -541,12 +493,12 @@ "dependencies": [], "declared": false, "instance": "instance2", - "readyAt": 0, "jobName": "staging-test", "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance2/job/staging-test", "environment": "staging", "region": "staging.us-east-3", "toRun": [], + "readyAt": 0, "runs": [] }, { @@ -565,10 +517,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 4, + "id": 4, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } } } @@ -591,10 +543,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 4, + "id": 4, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } } } @@ -617,10 +569,10 @@ "versions": { "targetPlatform": "6.1.0", "targetApplication": { - "build": 4, + "id": 4, + "commit": "commit1", "compileVersion": "6.1.0", - "sourceUrl": "repository1/tree/commit1", - "commit": "commit1" + "sourceUrl": "repository1/tree/commit1" } } } diff --git a/controller-server/src/test/resources/test_runner_services.xml-cd b/controller-server/src/test/resources/test_runner_services.xml-cd index 235ca7cb698..125c5004d25 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -15,49 +15,6 @@ <binding>http://*/tester/v1/*</binding> </handler> - <http> - <!-- Make sure 4080 is the first port. This will be used by the config server. --> - <server id='default' port='4080'/> - <server id='testertls4443' port='4443'> - <config name="jdisc.http.connector"> - <tlsClientAuthEnforcer> - <enable>true</enable> - <pathWhitelist> - <item>/status.html</item> - <item>/state/v1/config</item> - </pathWhitelist> - </tlsClientAuthEnforcer> - </config> - <ssl> - <private-key-file>/var/lib/sia/keys/vespa.vespa.tenant.key.pem</private-key-file> - <certificate-file>/var/lib/sia/certs/vespa.vespa.tenant.cert.pem</certificate-file> - <ca-certificates-file>/opt/yahoo/share/ssl/certs/athenz_certificate_bundle.pem</ca-certificates-file> - <client-authentication>want</client-authentication> - </ssl> - </server> - <filtering> - <access-control domain='vespa.vespa.cd'> - <exclude> - <binding>http://*/tester/v1/*</binding> - </exclude> - </access-control> - <request-chain id="testrunner-api"> - <filter id='authz-filter' class='com.yahoo.jdisc.http.filter.security.athenz.AthenzAuthorizationFilter' bundle="jdisc-security-filters"> - <config name="jdisc.http.filter.security.athenz.athenz-authorization-filter"> - <credentialsToVerify>TOKEN_ONLY</credentialsToVerify> - <roleTokenHeaderName>Yahoo-Role-Auth</roleTokenHeaderName> - </config> - <component id="com.yahoo.jdisc.http.filter.security.athenz.StaticRequestResourceMapper" bundle="jdisc-security-filters"> - <config name="jdisc.http.filter.security.athenz.static-request-resource-mapper"> - <resourceName>vespa.vespa.cd:tester-application</resourceName> - <action>deploy</action> - </config> - </component> - </filter> - </request-chain> - </filtering> - </http> - <nodes count="1" allocated-memory="17%"> <resources vcpu="2.00" memory="12.00Gb" disk="75.00Gb" disk-speed="fast" storage-type="local"/> </nodes> |