From 57f7d288ad65ddb84fb788b13bd7a9087ee46648 Mon Sep 17 00:00:00 2001 From: Lode Leroy <43440559+lleroy@users.noreply.github.com> Date: Wed, 12 Jul 2023 11:07:22 +0200 Subject: [PATCH] Check if parent job is MatrixConfiguration instead of MatrixProject Update PerforceScm.java - Check if parent job is MatrixConfiguration instead of MatrixProject when doing a matrix build: checkouts should be the same for each run of the matrix build see also https://issues.jenkins.io/projects/JENKINS/issues/JENKINS-71364 --- src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java b/src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java index e430480d..a3dae03a 100644 --- a/src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java +++ b/src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java @@ -607,7 +607,7 @@ To help lookForChanges() find the correct change to build, sending it the previo success = true; } } else { - if (job instanceof MatrixProject) { + if (job instanceof MatrixProject || job instanceof MatrixConfiguration) { if (parentChange != null) { log.println("Using parent change: " + parentChange); task.setBuildChange(parentChange);