Merge branch 'master' into revert-495-helpesk4557-disable-failing-test-for-now

Author: dduportal

.github/workflows/updatecli.yaml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.79.0
+        uses: updatecli/updatecli-action@v2.81.0
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml --values ./updatecli/values.temurin.yaml

Jenkinsfile

@@ -41,7 +41,7 @@ def spotAgentSelector(String agentLabel, int counter) {
 }
 
 // Specify parallel stages
-parallelStages = [failFast: false]
+def parallelStages = [failFast: false]
 [
     'linux',
     'nanoserver-1809',
@@ -52,7 +52,10 @@ parallelStages = [failFast: false]
     'windowsservercore-ltsc2022'
 ].each { imageType ->
     parallelStages[imageType] = {
-        withEnv(["IMAGE_TYPE=${imageType}", "REGISTRY_ORG=${infra.isTrusted() ? 'jenkins' : 'jenkins4eval'}"]) {
+        withEnv([
+          "IMAGE_TYPE=${imageType}", 
+          "REGISTRY_ORG=${infra.isTrusted() ? 'jenkins' : 'jenkins4eval'}",
+        ]) {
             int retryCounter = 0
             retry(count: 2, conditions: [agent(), nonresumable()]) {
                 // Use local variable to manage concurrency and increment BEFORE spinning up any agent
@@ -72,7 +75,7 @@ parallelStages = [failFast: false]
                             stage('Deploy to DockerHub') {
                                 withEnv([
                                     "ON_TAG=true",
-                                    VERSION = "${env.TAG_NAME}"
+                                    "VERSION=${env.TAG_NAME}",
                                 ]) {
                                     // This function is defined in the jenkins-infra/pipeline-library
                                     infra.withDockerCredentials {

debian/Dockerfile

@@ -20,7 +20,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 ARG DEBIAN_RELEASE=bookworm-20250317
-FROM debian:"${DEBIAN_RELEASE}"-slim as jre-build
+FROM debian:"${DEBIAN_RELEASE}"-slim AS jre-build
 
 SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]
 

windows/nanoserver/Dockerfile

@@ -91,8 +91,8 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
 
 ARG user=jenkins
 ARG JENKINS_AGENT_WORK="C:/Users/${user}/Work"
-ENV JENKINS_AGENT_USER ${user}
-ENV JENKINS_AGENT_WORK ${JENKINS_AGENT_WORK}
+ENV JENKINS_AGENT_USER=${user}
+ENV JENKINS_AGENT_WORK=${JENKINS_AGENT_WORK}
 
 # Setup SSH server
 ARG OPENSSH_VERSION=v9.8.1.0p1-Preview

windows/windowsservercore/Dockerfile

@@ -49,8 +49,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 
 ARG user=jenkins
 ARG JENKINS_AGENT_WORK="C:/Users/${user}/Work"
-ENV JENKINS_AGENT_USER ${user}
-ENV JENKINS_AGENT_WORK ${JENKINS_AGENT_WORK}
+ENV JENKINS_AGENT_USER=${user}
+ENV JENKINS_AGENT_WORK=${JENKINS_AGENT_WORK}
 
 USER ContainerAdministrator