Move defaultSourceRevision to DeploymentContext

5 files changed, 12 insertions, 10 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 efce8642294..192c71094a5 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
@@ -31,6 +31,7 @@ import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics;
 import com.yahoo.vespa.hosted.controller.application.JobStatus;
 import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder;
 import com.yahoo.vespa.hosted.controller.deployment.BuildJob;
+import com.yahoo.vespa.hosted.controller.deployment.DeploymentContext;
 import com.yahoo.vespa.hosted.controller.deployment.InternalDeploymentTester;
 import com.yahoo.vespa.hosted.controller.integration.ZoneApiMock;
 import com.yahoo.vespa.hosted.controller.rotation.RotationId;
@@ -83,7 +84,7 @@ public class ControllerTest {
         var context = tester.deploymentContext();
         context.submit(applicationPackage);
         assertEquals("Application version is known from completion of initial job",
-                     ApplicationVersion.from(BuildJob.defaultSourceRevision, 1, "a@b", new Version("6.1"), Instant.ofEpochSecond(1)),
+                     ApplicationVersion.from(DeploymentContext.defaultSourceRevision, 1, "a@b", new Version("6.1"), Instant.ofEpochSecond(1)),
                      context.application().change().application().get());
         context.runJob(systemTest);
         context.runJob(stagingTest);
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 ce733d60a77..d1303c4a7ed 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
@@ -23,16 +23,15 @@ import static com.yahoo.vespa.hosted.controller.api.integration.deployment.JobTy
  *
  * @author mpolden
  */
+
 public class BuildJob {
 
-    public static final SourceRevision defaultSourceRevision = new SourceRevision("repository1",
-                                                                                  "master", "commit1");
     public static final long defaultBuildNumber = 42;
 
     private JobType job;
     private ApplicationId applicationId;
     private Optional<DeploymentJobs.JobError> jobError = Optional.empty();
-    private Optional<SourceRevision> sourceRevision = Optional.of(defaultSourceRevision);
+    private Optional<SourceRevision> sourceRevision = Optional.of(DeploymentContext.defaultSourceRevision);
     private long projectId;
     private long buildNumber = defaultBuildNumber;
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
index a8e7d96710f..95934b528e0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
@@ -83,6 +83,7 @@ public class DeploymentContext {
             .emailAddress("b@a")
             .trust(generateCertificate())
             .build();
+    public static final SourceRevision defaultSourceRevision = new SourceRevision("repository1", "master", "commit1");
 
     private final TenantAndApplicationId applicationId;
     private final ApplicationId instanceId;
@@ -196,7 +197,7 @@ public class DeploymentContext {
 
     /** Submit given application package for deployment */
     public DeploymentContext submit(ApplicationPackage applicationPackage) {
-        return submit(applicationPackage, BuildJob.defaultSourceRevision);
+        return submit(applicationPackage, defaultSourceRevision);
     }
 
     /** Submit given application package for deployment */
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
index d8261d2d79f..fc38d9d1f52 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
@@ -164,7 +164,7 @@ public class InternalDeploymentTester {
     }
 
     public ApplicationVersion newSubmission(TenantAndApplicationId id, ApplicationPackage applicationPackage) {
-        return newSubmission(id, applicationPackage, BuildJob.defaultSourceRevision);
+        return newSubmission(id, applicationPackage, DeploymentContext.defaultSourceRevision);
     }
 
     /**
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 f7af8ff4ce4..54f95078f15 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
@@ -62,6 +62,7 @@ import com.yahoo.vespa.hosted.controller.application.TenantAndApplicationId;
 import com.yahoo.vespa.hosted.controller.athenz.HostedAthenzIdentities;
 import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder;
 import com.yahoo.vespa.hosted.controller.deployment.BuildJob;
+import com.yahoo.vespa.hosted.controller.deployment.DeploymentContext;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentTrigger;
 import com.yahoo.vespa.hosted.controller.integration.ConfigServerMock;
 import com.yahoo.vespa.hosted.controller.integration.ServiceRegistryMock;
@@ -315,7 +316,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
 
         // POST an application deployment to a production zone - operator emergency deployment - fails since package is unknown
         entity = createApplicationDeployData(Optional.empty(),
-                                             Optional.of(ApplicationVersion.from(BuildJob.defaultSourceRevision,
+                                             Optional.of(ApplicationVersion.from(DeploymentContext.defaultSourceRevision,
                                                                                  BuildJob.defaultBuildNumber - 1)),
                                              true);
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-central-1/instance/instance1/", POST)
@@ -326,7 +327,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
 
         // POST an application deployment to a production zone - operator emergency deployment - works with known package
         entity = createApplicationDeployData(Optional.empty(),
-                                             Optional.of(ApplicationVersion.from(BuildJob.defaultSourceRevision,
+                                             Optional.of(ApplicationVersion.from(DeploymentContext.defaultSourceRevision,
                                                                                  BuildJob.defaultBuildNumber)),
                                              true);
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-central-1/instance/instance1/", POST)
@@ -731,7 +732,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
                                                                                         1234,
                                                                                         123,
                                                                                         Optional.empty(),
-                                                                                        BuildJob.defaultSourceRevision))),
+                                                                                        DeploymentContext.defaultSourceRevision))),
                               "{\"error-code\":\"BAD_REQUEST\",\"message\":\"" + app1 + " is set up to be deployed from internally," +
                               " and no longer accepts submissions from Screwdriver v3 jobs. If you need to revert " +
                               "to the old pipeline, please file a ticket at yo/vespa-support and request this.\"}",
@@ -769,7 +770,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
                                                                                         1234,
                                                                                         123,
                                                                                         Optional.empty(),
-                                                                                        BuildJob.defaultSourceRevision))),
+                                                                                        DeploymentContext.defaultSourceRevision))),
                               "{\"message\":\"ok\"}");
 
         // PUT (create) the authenticated user