diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-03-16 14:55:00 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2018-03-16 15:40:57 +0100 |
commit | e0479e09d6651bfebb571492f9fee6838502b265 (patch) | |
tree | a878c5035c5ec45817876de848b6b55417e8e559 /controller-server/src/test | |
parent | 1b78af9b70773ef4f7c64779f5c78dc516040b87 (diff) |
Remove explicit build numbers
Diffstat (limited to 'controller-server/src/test')
5 files changed, 24 insertions, 22 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index a898c3eec68..bba82ce2980 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -10,19 +10,14 @@ import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.TenantName; -import com.yahoo.vespa.athenz.api.AthenzDomain; import com.yahoo.vespa.athenz.api.NToken; import com.yahoo.vespa.config.SlimeUtils; -import com.yahoo.vespa.hosted.controller.api.Tenant; import com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions; import com.yahoo.vespa.hosted.controller.api.application.v4.model.EndpointStatus; import com.yahoo.vespa.hosted.controller.api.application.v4.model.ScrewdriverBuildJob; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; -import com.yahoo.vespa.hosted.controller.api.identifiers.Property; -import com.yahoo.vespa.hosted.controller.api.identifiers.PropertyId; import com.yahoo.vespa.hosted.controller.api.identifiers.ScrewdriverId; import com.yahoo.vespa.hosted.controller.api.identifiers.TenantId; -import com.yahoo.vespa.hosted.controller.api.identifiers.UserGroup; import com.yahoo.vespa.hosted.controller.api.integration.BuildService; import com.yahoo.vespa.hosted.controller.api.integration.dns.Record; import com.yahoo.vespa.hosted.controller.api.integration.dns.RecordName; @@ -36,11 +31,10 @@ import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobError; import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType; import com.yahoo.vespa.hosted.controller.application.JobStatus; import com.yahoo.vespa.hosted.controller.application.SourceRevision; -import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzDbMock; import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder; +import com.yahoo.vespa.hosted.controller.deployment.BuildJob; import com.yahoo.vespa.hosted.controller.deployment.DeploymentQueue; import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester; -import com.yahoo.vespa.hosted.controller.deployment.BuildJob; import com.yahoo.vespa.hosted.controller.persistence.ApplicationSerializer; import com.yahoo.vespa.hosted.controller.rotation.RotationId; import com.yahoo.vespa.hosted.controller.rotation.RotationLock; @@ -179,7 +173,7 @@ public class ControllerTest { .environment(Environment.prod) .region("us-east-3") .build(); - tester.jobCompletion(component).application(app1).buildNumber(43).uploadArtifact(applicationPackage).submit(); + tester.jobCompletion(component).application(app1).nextBuildNumber().uploadArtifact(applicationPackage).submit(); try { tester.deploy(systemTest, app1, applicationPackage); fail("Expected exception due to unallowed production deployment removal"); @@ -201,7 +195,7 @@ public class ControllerTest { .environment(Environment.prod) .region("us-east-3") .build(); - tester.jobCompletion(component).application(app1).buildNumber(44).uploadArtifact(applicationPackage).submit(); + tester.jobCompletion(component).application(app1).nextBuildNumber(2).uploadArtifact(applicationPackage).submit(); tester.deployAndNotify(app1, applicationPackage, true, systemTest); assertNull("Zone was removed", applications.require(app1.id()).deployments().get(productionCorpUsEast1.zone(SystemName.main).get())); @@ -266,7 +260,7 @@ public class ControllerTest { .region("us-west-1") .region("us-east-3") .build(); - tester.jobCompletion(component).application(app1).buildNumber(43).uploadArtifact(applicationPackage).submit(); + tester.jobCompletion(component).application(app1).nextBuildNumber().uploadArtifact(applicationPackage).submit(); tester.deployAndNotify(app1, applicationPackage, true, systemTest); tester.deployAndNotify(app1, applicationPackage, true, stagingTest); tester.deployAndNotify(app1, applicationPackage, true, productionUsWest1); @@ -458,7 +452,7 @@ public class ControllerTest { // out of capacity retry mechanism tester.clock().advance(Duration.ofMinutes(15)); tester.jobCompletion(stagingTest).application(app1).error(JobError.outOfCapacity).submit(); // Clear the previous staging test - tester.jobCompletion(component).application(app1).buildNumber(43).uploadArtifact(applicationPackage).submit(); + tester.jobCompletion(component).application(app1).nextBuildNumber().uploadArtifact(applicationPackage).submit(); tester.deployAndNotify(app1, applicationPackage, true, false, systemTest); tester.deploy(stagingTest, app1, applicationPackage); assertEquals(1, deploymentQueue.takeJobsToRun().size()); @@ -467,10 +461,10 @@ public class ControllerTest { // app2 and app3: New change triggers system-test jobs // Provide a changed application package, too, or the deployment is a no-op. - tester.jobCompletion(component).application(app2).buildNumber(43).uploadArtifact(applicationPackage).submit(); + tester.jobCompletion(component).application(app2).nextBuildNumber().uploadArtifact(applicationPackage).submit(); tester.deployAndNotify(app2, applicationPackage2, true, systemTest); - tester.jobCompletion(component).application(app3).buildNumber(43).uploadArtifact(applicationPackage).submit(); + tester.jobCompletion(component).application(app3).nextBuildNumber().uploadArtifact(applicationPackage).submit(); tester.deployAndNotify(app3, applicationPackage2, true, systemTest); assertEquals(2, deploymentQueue.jobs().size()); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/BuildJob.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/BuildJob.java index 0ea50221cfc..bb8840a7b1f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/BuildJob.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/BuildJob.java @@ -74,6 +74,14 @@ public class BuildJob { return this; } + public BuildJob nextBuildNumber(int increment) { + return buildNumber(buildNumber + increment); + } + + public BuildJob nextBuildNumber() { + return nextBuildNumber(1); + } + public BuildJob projectId(long projectId) { this.projectId = projectId; return this; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java index c4b3bd82bfe..5aa0d794e65 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java @@ -305,7 +305,7 @@ public class DeploymentTriggerTest { ApplicationPackage changedApplication = applicationPackageBuilder.searchDefinition(searchDefinition).build(); tester.jobCompletion(component) .application(app) - .buildNumber(43) + .nextBuildNumber() .sourceRevision(new SourceRevision("repository1", "master", "cafed00d")) .uploadArtifact(changedApplication) .submit(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java index 4ee9d50a3f7..12fb2b6c862 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java @@ -49,7 +49,7 @@ public class OutstandingChangeDeployerTest { tester.jobCompletion(DeploymentJobs.JobType.component) .application(tester.application("app1")) .sourceRevision(new SourceRevision("repository1","master", "cafed00d")) - .buildNumber(43) + .nextBuildNumber() .uploadArtifact(applicationPackage) .submit(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java index 09836738af0..4481c1201d8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java @@ -532,12 +532,12 @@ public class UpgraderTest { // Multiple application changes are triggered and fail, but does not affect version confidence as upgrade has // completed successfully - tester.jobCompletion(component).application(default0).buildNumber(43).uploadArtifact(canaryPolicy).unsuccessful().submit(); - tester.jobCompletion(component).application(default1).buildNumber(43).uploadArtifact(canaryPolicy).unsuccessful().submit(); - tester.jobCompletion(component).application(default2).buildNumber(43).uploadArtifact(defaultPolicy).submit(); - tester.jobCompletion(component).application(default3).buildNumber(43).uploadArtifact(defaultPolicy).submit(); - tester.jobCompletion(component).application(default2).buildNumber(44).uploadArtifact(canaryPolicy).unsuccessful().submit(); - tester.jobCompletion(component).application(default3).buildNumber(44).uploadArtifact(canaryPolicy).unsuccessful().submit(); + tester.jobCompletion(component).application(default0).nextBuildNumber().uploadArtifact(canaryPolicy).unsuccessful().submit(); + tester.jobCompletion(component).application(default1).nextBuildNumber().uploadArtifact(canaryPolicy).unsuccessful().submit(); + tester.jobCompletion(component).application(default2).nextBuildNumber().uploadArtifact(defaultPolicy).submit(); + tester.jobCompletion(component).application(default3).nextBuildNumber().uploadArtifact(defaultPolicy).submit(); + tester.jobCompletion(component).application(default2).nextBuildNumber().uploadArtifact(canaryPolicy).unsuccessful().submit(); + tester.jobCompletion(component).application(default3).nextBuildNumber(2).uploadArtifact(canaryPolicy).unsuccessful().submit(); tester.updateVersionStatus(version); assertEquals(VespaVersion.Confidence.normal, tester.controller().versionStatus().systemVersion().get().confidence()); } @@ -869,7 +869,7 @@ public class UpgraderTest { tester.deployAndNotify(app, applicationPackage, false, productionUsWest1); // New application change - tester.jobCompletion(component).application(app).buildNumber(43).uploadArtifact(applicationPackage).submit(); + tester.jobCompletion(component).application(app).nextBuildNumber().uploadArtifact(applicationPackage).submit(); String applicationVersion = "1.0.43-commit1"; // Application change recorded together with ongoing upgrade |