allow DeployType to be set by deployment

ibi-group · Jan 23, 2024 · b6345fd · b6345fd
1 parent 8085053
commit b6345fd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/DeployJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/DeployJob.java
@@ -203,10 +203,7 @@ public OtpServer getOtpServer() {
      * @param otpServer the server/ELB target for the deployment
      */
     public DeployJob(Deployment deployment, Auth0UserProfile owner, OtpServer otpServer) {
-        this(deployment, owner, otpServer, null, DeployType.REPLACE);
-    }
-    public DeployJob(Deployment deployment, Auth0UserProfile owner, OtpServer otpServer, DeployType deployType) {
-        this(deployment, owner, otpServer, null, deployType);
+        this(deployment, owner, otpServer, null, deployment.deployType);
     }
 
     public DeployJob(

diff --git a/src/main/java/com/conveyal/datatools/manager/models/Deployment.java b/src/main/java/com/conveyal/datatools/manager/models/Deployment.java
@@ -189,6 +189,12 @@ public List<EC2InstanceSummary> retrieveEC2Instances() throws CheckedAWSExceptio
      */
     public DeploymentMode deploymentMode = DeploymentMode.RUNNER;
 
+    /**
+     * Which deploymentType this deployment will use. The long-standing default is "REPLACE",
+     * but USE_PREBUILT_GRAPH allows for re-deploying an existing graph.
+     */
+    public DeployJob.DeployType deployType = DeployJob.DeployType.REPLACE;
+
     /**
      * The version (according to git describe) of OTP being used on this deployment. This should default to
      * {@link Deployment#DEFAULT_OTP_VERSION}. This is used to determine what jar file to download and does not have an