TODOs

3 files changed, 6 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 9e4e5b19f64..5823dd160c0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -307,9 +307,12 @@ public class ApplicationController {
                 // Clean up deployment jobs that are no longer referenced by deployment spec
                 application = deleteUnreferencedDeploymentJobs(application);
 
+                // TODO jvenstad: Store triggering information here, including versions, when job status is read from the build service.
+
                 store(application); // store missing information even if we fail deployment below
             }
 
+            // TODO jvenstad: Use code from DeploymentTrigger? Also, validate application version.
             // Validate the change being deployed
             if (!canDeployDirectly) {
                 validateChange(application, zone, version);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobStatus.java
index 10fc1b41733..d5d7cf1c0ef 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobStatus.java
@@ -80,6 +80,7 @@ public class JobStatus {
                                             ", but that has neither been triggered nor deployed");
 
         } else {
+            // TODO jvenstad: This is wrong, because triggering versions are not necessarily the same as deployed versions!
             version = lastTriggered.get().version();
             applicationVersion = lastTriggered.get().applicationVersion();
             reason = lastTriggered.get().reason();
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 0f27131aaad..2f111c84773 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -104,6 +104,7 @@ public class DeploymentTrigger {
                 application = application.withChange(Change.empty());
             }
 
+            // TODO jvenstad: Don't trigger.
             // Trigger next
             if (report.success())
                 application = trigger(order.nextAfter(report.jobType(), application), application,
@@ -234,6 +235,7 @@ public class DeploymentTrigger {
             application = application.withChange(change);
             if (change.application().isPresent())
                 application = application.withOutstandingChange(Change.empty());
+            // TODO jvenstad: Don't trigger.
             application = trigger(JobType.systemTest, application, false, change.toString());
             applications().store(application);
         });