[JENKINS-8597] Deal with matrix builds better

jenkinsci · Dec 4, 2013 · 668853c · 668853c
1 parent 1687bb4
commit 668853c
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/src/main/java/jenkins/advancedqueue/PriorityConfiguration.java b/src/main/java/jenkins/advancedqueue/PriorityConfiguration.java
@@ -25,13 +25,15 @@
 
 import hudson.Extension;
 import hudson.ExtensionList;
-import hudson.model.Describable;
-import hudson.model.RootAction;
-import hudson.model.TopLevelItem;
+import hudson.matrix.MatrixConfiguration;
+import hudson.matrix.MatrixProject;
 import hudson.model.AbstractProject;
+import hudson.model.Describable;
 import hudson.model.Descriptor;
 import hudson.model.Job;
 import hudson.model.Queue;
+import hudson.model.RootAction;
+import hudson.model.TopLevelItem;
 import hudson.model.View;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
@@ -201,6 +203,18 @@ public int getPriority(Queue.Item item) {
 	private int getPriorityValue(Queue.Item item) {
 		Job<?, ?> job = (Job<?, ?>) item.task;
 
+		// [JENKINS-8597]
+		// For MatrixConfiguration use the latest assigned Priority from the MatrixProject
+		if (job instanceof MatrixConfiguration) {
+			MatrixProject matrixProject = ((MatrixConfiguration) job).getParent();
+			ActualAdvancedQueueSorterJobProperty property = matrixProject
+					.getProperty(ActualAdvancedQueueSorterJobProperty.class);
+			if (property == null) {
+				return PrioritySorterConfiguration.get().getStrategy().getDefaultPriority();
+			}
+			return property.getPriority();
+		}
+
 		if (PrioritySorterConfiguration.get().getAllowPriorityOnJobs()) {
 			AdvancedQueueSorterJobProperty priorityProperty = job.getProperty(AdvancedQueueSorterJobProperty.class);
 			if (priorityProperty != null && priorityProperty.getUseJobPriority()) {