From 9490dedd2370ff282dcb33ad9db87ecea8efdd9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=B6wenstein=20Medical=20Innovation=20F+E?=
 <90915021+lmife@users.noreply.github.com>
Date: Fri, 23 Feb 2024 08:24:59 +0100
Subject: [PATCH] JENKINS-65315: SubmoduleOption: resolve env vars in reference
 path

On contrary to Freestyle projects' getEnvironment, WorkflowRun.getEnvironment doesn't provide node-specific environment variables as it can have multiple node blocks in parallel. So I suggest to pick up envvars just in place.

See also https://github.com/jenkinsci/git-plugin/pull/575
---
 .../git/extensions/impl/SubmoduleOption.java    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/hudson/plugins/git/extensions/impl/SubmoduleOption.java b/src/main/java/hudson/plugins/git/extensions/impl/SubmoduleOption.java
index 94ecfe6878..0f4511fcda 100644
--- a/src/main/java/hudson/plugins/git/extensions/impl/SubmoduleOption.java
+++ b/src/main/java/hudson/plugins/git/extensions/impl/SubmoduleOption.java
@@ -1,6 +1,9 @@
 package hudson.plugins.git.extensions.impl;
 
+import hudson.EnvVars;
 import hudson.Extension;
+import hudson.model.Computer;
+import hudson.model.Node;
 import hudson.model.Run;
 import hudson.model.TaskListener;
 import hudson.plugins.git.GitException;
@@ -9,6 +12,8 @@
 import hudson.plugins.git.extensions.GitSCMExtension;
 import hudson.plugins.git.extensions.GitSCMExtensionDescriptor;
 import hudson.plugins.git.util.BuildData;
+import hudson.plugins.git.util.GitUtils;
+import hudson.slaves.NodeProperty;
 import java.io.IOException;
 import java.util.Objects;
 import org.jenkinsci.plugins.gitclient.GitClient;
@@ -179,11 +184,21 @@ public void onCheckoutCompleted(GitSCM scm, Run<?, ?> build, GitClient git, Task
                 // This ensures we don't miss changes to submodule paths and allows
                 // seamless use of bare and non-bare superproject repositories.
                 git.setupSubmoduleUrls(revToBuild.lastBuild.getRevision(), listener);
+                
+                Node node = GitUtils.workspaceToNode(git.getWorkTree());
+                EnvVars env = build.getEnvironment(listener);
+                Computer comp = node.toComputer();
+                if (comp != null) {
+                    env.putAll(comp.getEnvironment());
+                }
+                for (NodeProperty nodeProperty: node.getNodeProperties()) {
+                    nodeProperty.buildEnvVars(env, listener);
+                }
                 SubmoduleUpdateCommand cmd = git.submoduleUpdate()
                         .recursive(recursiveSubmodules)
                         .remoteTracking(trackingSubmodules)
                         .parentCredentials(parentCredentials)
-                        .ref(build.getEnvironment(listener).expand(reference))
+                        .ref(env.expand(reference))
                         .timeout(timeout)
                         .shallow(shallow);
                 if (shallow) {