summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java2
1 files changed, 1 insertions, 1 deletions
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 8f0786cb629..169cde8437a 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
@@ -378,7 +378,7 @@ public class DeploymentTrigger {
DeploymentStatus.Job job = jobsList.get(0);
if ( job.readyAt().isPresent()
&& ! clock.instant().isBefore(job.readyAt().get())
- && ! controller.jobController().isDisabled(jobId)
+ && ! controller.jobController().isDisabled(new JobId(jobId.application(), job.type()))
&& ! (jobId.type().isProduction() && isUnhealthyInAnotherZone(status.application(), jobId))
&& abortIfRunning(status, jobsToRun, jobId)) // Abort and trigger this later if running with outdated parameters.
jobs.add(deploymentJob(status.application().require(jobId.application().instance()),