Fix image and artifact name conditional

Azure · Mar 5, 2024 · bc271ca · bc271ca
1 parent bc03c53
commit bc271ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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