Fix image and artifact name conditional

benbp · azure-sdk · commit 4fc0bc515ffc · 2024-03-05T21:39:16.000Z
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

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ steps:`
`20`	`20`	`} else {`
`21`	`21`	`Write-Host "##vso[task.setvariable variable=PublishArtifactName;]${{ parameters.ArtifactName }}"`
`22`	`22`	`}`
`23`		`- condition: and(failed(), ${{ parameters.CustomCondition }})`
	`23`	`+ condition: and(succeededOrFailed(), ${{ parameters.CustomCondition }})`
`24`	`24`	`displayName: Set Artifact Name $(Agent.JobStatus)`
`25`	`25`
`26`	`26`	`- task: 1ES.PublishPipelineArtifact@1`