Merge pull request spinnaker#794 from lwander/job-cleanup

Fixup missing imports & clarify logic w/ comment
stitchfix · Apr 26, 2016 · 95ec5db · 95ec5db
2 parents f8ef2b8 + c3cdac6
commit 95ec5db
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/...river/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/MonitorKatoTask.groovy b/...river/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/MonitorKatoTask.groovy
@@ -58,6 +58,8 @@ class MonitorKatoTask implements RetryableTask {
     Map<String, ? extends Object> outputs = [:]
     if (status == ExecutionStatus.SUCCEEDED) {
       def deployed = getDeployedNames(katoTask)
+      // The below two checks aren't mutually exclusive since both `deploy.server.groups` and `deploy.jobs` can initially
+      // by empty, although only one of them needs to be filled.
       if (!stage.context.containsKey("deploy.server.groups")) {
         outputs["deploy.server.groups"] = getServerGroupNames(katoTask)
       }

diff --git a/...n/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/JobForceCacheRefreshTask.groovy b/...n/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/JobForceCacheRefreshTask.groovy
@@ -20,7 +20,6 @@ import com.netflix.spinnaker.orca.DefaultTaskResult
 import com.netflix.spinnaker.orca.ExecutionStatus
 import com.netflix.spinnaker.orca.Task
 import com.netflix.spinnaker.orca.TaskResult
-import com.netflix.spinnaker.orca.clouddriver.MortService
 import com.netflix.spinnaker.orca.clouddriver.OortService
 import com.netflix.spinnaker.orca.clouddriver.tasks.AbstractCloudProviderAwareTask
 import com.netflix.spinnaker.orca.pipeline.model.Stage

diff --git a/...c/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletion.groovy b/...c/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletion.groovy
@@ -22,7 +22,6 @@ import com.netflix.spinnaker.orca.DefaultTaskResult
 import com.netflix.spinnaker.orca.ExecutionStatus
 import com.netflix.spinnaker.orca.RetryableTask
 import com.netflix.spinnaker.orca.TaskResult
-import com.netflix.spinnaker.orca.clouddriver.MortService
 import com.netflix.spinnaker.orca.clouddriver.OortService
 import com.netflix.spinnaker.orca.clouddriver.tasks.AbstractCloudProviderAwareTask
 import com.netflix.spinnaker.orca.pipeline.model.Stage