From bc271caf19549093f9504c823ccf5a1b835e7f09 Mon Sep 17 00:00:00 2001
From: Ben Broderick Phillips <bebroder@microsoft.com>
Date: Tue, 5 Mar 2024 16:37:28 -0500
Subject: [PATCH] Fix image and artifact name conditional

---
 eng/common/pipelines/templates/jobs/generate-job-matrix.yml   | 2 +-
 eng/common/pipelines/templates/steps/publish-1es-artifact.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/common/pipelines/templates/jobs/generate-job-matrix.yml b/eng/common/pipelines/templates/jobs/generate-job-matrix.yml
index 67ee92a93839..a7459e6b5db5 100644
--- a/eng/common/pipelines/templates/jobs/generate-job-matrix.yml
+++ b/eng/common/pipelines/templates/jobs/generate-job-matrix.yml
@@ -66,7 +66,7 @@ jobs:
       value: $[ coalesce(variables.jobMatrixFilter, '.*') ]
   pool:
     name: ${{ parameters.Pool }}
-    vmImage: ${{ parameters.OsVmImage }}
+    image: ${{ parameters.OsVmImage }}
     os: ${{ parameters.Os }}
   ${{ if parameters.DependsOn }}:
     dependsOn: ${{ parameters.DependsOn }}
diff --git a/eng/common/pipelines/templates/steps/publish-1es-artifact.yml b/eng/common/pipelines/templates/steps/publish-1es-artifact.yml
index a8ebae6d738b..7648a34165f7 100644
--- a/eng/common/pipelines/templates/steps/publish-1es-artifact.yml
+++ b/eng/common/pipelines/templates/steps/publish-1es-artifact.yml
@@ -20,7 +20,7 @@ steps:
       } else {
         Write-Host "##vso[task.setvariable variable=PublishArtifactName;]${{ parameters.ArtifactName }}"
       }
-    condition: and(failed(), ${{ parameters.CustomCondition }})
+    condition: and(succeededOrFailed(), ${{ parameters.CustomCondition }})
     displayName: Set Artifact Name $(Agent.JobStatus)
 
   - task: 1ES.PublishPipelineArtifact@1