@@ -171,89 +171,89 @@ jobs:
171171 $(dryRunArg)
172172 $(imageBuilder.commonCmdArgs)
173173
174- # - template: /eng/common/templates/steps/run-imagebuilder.yml@self
175- # parameters:
176- # displayName: 🟪⚠️ Generate EOL Annotation Data
177- # serviceConnection: $(publish.serviceConnectionName)
178- # internalProjectName: internal
179- # condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
180- # args: >
181- # generateEolAnnotationData
182- # '$(artifactsPath)/eol-annotation-data/eol-annotation-data.json'
183- # '$(imageInfoContainerDir)/full-image-info-orig.json'
184- # '$(imageInfoContainerDir)/full-image-info-new.json'
185- # '$(acr.server)'
186- # '$(publishRepoPrefix)'
187- # $(generateEolAnnotationDataExtraOptions)
188- # $(dryRunArg)
174+ - template : /eng/common/templates/steps/run-imagebuilder.yml@self
175+ parameters :
176+ displayName : 🟪⚠️ Generate EOL Annotation Data
177+ serviceConnection : $(publish.serviceConnectionName)
178+ internalProjectName : internal
179+ condition : and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
180+ args : >
181+ generateEolAnnotationData
182+ '$(artifactsPath)/eol-annotation-data/eol-annotation-data.json'
183+ '$(imageInfoContainerDir)/full-image-info-orig.json'
184+ '$(imageInfoContainerDir)/full-image-info-new.json'
185+ '$(acr.server)'
186+ '$(publishRepoPrefix)'
187+ $(generateEolAnnotationDataExtraOptions)
188+ $(dryRunArg)
189189
190- # - template: /eng/common/templates/steps/publish-artifact.yml@self
191- # parameters:
192- # path: $(Build.ArtifactStagingDirectory)/eol-annotation-data
193- # artifactName: eol-annotation-data-$(System.JobAttempt)
194- # displayName: 🟪 Publish EOL Annotation Data Artifact
195- # internalProjectName: internal
196- # publicProjectName: public
197- # condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
190+ - template : /eng/common/templates/steps/publish-artifact.yml@self
191+ parameters :
192+ path : $(Build.ArtifactStagingDirectory)/eol-annotation-data
193+ artifactName : eol-annotation-data-$(System.JobAttempt)
194+ displayName : 🟪 Publish EOL Annotation Data Artifact
195+ internalProjectName : internal
196+ publicProjectName : public
197+ condition : and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
198198
199- # - template: /eng/common/templates/steps/annotate-eol-digests.yml@self
200- # parameters:
201- # internalProjectName: ${{ parameters.internalProjectName }}
202- # dataFile: $(artifactsPath)/eol-annotation-data/eol-annotation-data.json
199+ - template : /eng/common/templates/steps/annotate-eol-digests.yml@self
200+ parameters :
201+ internalProjectName : ${{ parameters.internalProjectName }}
202+ dataFile : $(artifactsPath)/eol-annotation-data/eol-annotation-data.json
203203
204- # - script: >
205- # $(runImageBuilderCmd) publishImageInfo
206- # '$(imageInfoContainerDir)/full-image-info-new.json'
207- # '$(gitHubVersionsRepoInfo.userName)'
208- # '$(gitHubVersionsRepoInfo.email)'
209- # $(gitHubVersionsRepoInfo.authArgs)
210- # --git-owner '$(gitHubVersionsRepoInfo.org)'
211- # --git-repo '$(gitHubVersionsRepoInfo.repo)'
212- # --git-branch '$(gitHubVersionsRepoInfo.branch)'
213- # --git-path '$(gitHubImageInfoVersionsPath)'
214- # $(dryRunArg)
215- # $(imageBuilder.commonCmdArgs)
216- # condition: and(succeeded(), eq(variables['publishImageInfo'], 'true'))
217- # displayName: 🟪⚠️ Publish Image Info
204+ - script : >
205+ $(runImageBuilderCmd) publishImageInfo
206+ '$(imageInfoContainerDir)/full-image-info-new.json'
207+ '$(gitHubVersionsRepoInfo.userName)'
208+ '$(gitHubVersionsRepoInfo.email)'
209+ $(gitHubVersionsRepoInfo.authArgs)
210+ --git-owner '$(gitHubVersionsRepoInfo.org)'
211+ --git-repo '$(gitHubVersionsRepoInfo.repo)'
212+ --git-branch '$(gitHubVersionsRepoInfo.branch)'
213+ --git-path '$(gitHubImageInfoVersionsPath)'
214+ $(dryRunArg)
215+ $(imageBuilder.commonCmdArgs)
216+ condition: and(succeeded(), eq(variables['publishImageInfo'], 'true'))
217+ displayName: 🟪⚠️ Publish Image Info
218218
219- # - script: >
220- # $(runImageBuilderCmd) postPublishNotification
221- # '$(publishNotificationRepoName)'
222- # '$(branchName)'
223- # '$(imageInfoContainerDir)/image-info.json'
224- # $(Build.BuildId)
225- # '$(System.AccessToken)'
226- # '$(azdoOrgName)'
227- # '$(System.TeamProject)'
228- # $(gitHubNotificationsRepoInfo.authArgs)
229- # '$(gitHubNotificationsRepoInfo.org)'
230- # '$(gitHubNotificationsRepoInfo.repo)'
231- # --repo-prefix '$(publishRepoPrefix)'
232- # --task "Copy Images (Authenticated)"
233- # --task "Publish Manifest (Authenticated)"
234- # --task "Wait for Image Ingestion (Authenticated)"
235- # --task "Publish Readmes"
236- # --task "Wait for MCR Doc Ingestion (Authenticated)"
237- # --task "Publish Image Info"
238- # --task "Ingest Kusto Image Info (Authenticated)"
239- # --task "Generate EOL Annotation Data (Authenticated)"
240- # --task "Annotate EOL Images (Authenticated)"
241- # --task "Wait for Annotation Ingestion (Authenticated)"
242- # $(dryRunArg)
243- # $(imageBuilder.commonCmdArgs)
244- # displayName: 🟪⚠️ Post Publish Notification
245- # condition: and(always(), eq(variables['publishNotificationsEnabled'], 'true'))
219+ - script : >
220+ $(runImageBuilderCmd) postPublishNotification
221+ '$(publishNotificationRepoName)'
222+ '$(branchName)'
223+ '$(imageInfoContainerDir)/image-info.json'
224+ $(Build.BuildId)
225+ '$(System.AccessToken)'
226+ '$(azdoOrgName)'
227+ '$(System.TeamProject)'
228+ $(gitHubNotificationsRepoInfo.authArgs)
229+ '$(gitHubNotificationsRepoInfo.org)'
230+ '$(gitHubNotificationsRepoInfo.repo)'
231+ --repo-prefix '$(publishRepoPrefix)'
232+ --task "Copy Images (Authenticated)"
233+ --task "Publish Manifest (Authenticated)"
234+ --task "Wait for Image Ingestion (Authenticated)"
235+ --task "Publish Readmes"
236+ --task "Wait for MCR Doc Ingestion (Authenticated)"
237+ --task "Publish Image Info"
238+ --task "Ingest Kusto Image Info (Authenticated)"
239+ --task "Generate EOL Annotation Data (Authenticated)"
240+ --task "Annotate EOL Images (Authenticated)"
241+ --task "Wait for Annotation Ingestion (Authenticated)"
242+ $(dryRunArg)
243+ $(imageBuilder.commonCmdArgs)
244+ displayName: 🟪⚠️ Post Publish Notification
245+ condition: and(always(), eq(variables['publishNotificationsEnabled'], 'true'))
246246
247- # - powershell: |
248- # New-Item -ItemType Directory -Path $(sourceBuildIdOutputDir)
249- # Set-Content -Path $(sourceBuildIdOutputDir)/source-build-id.txt -Value ${{ parameters.sourceBuildPipelineRunId }}
250- # condition: succeeded()
251- # displayName: 🟪 Write Source Build ID to File
247+ - powershell : |
248+ New-Item -ItemType Directory -Path $(sourceBuildIdOutputDir)
249+ Set-Content -Path $(sourceBuildIdOutputDir)/source-build-id.txt -Value ${{ parameters.sourceBuildPipelineRunId }}
250+ condition: succeeded()
251+ displayName: 🟪 Write Source Build ID to File
252252
253- # - template: /eng/common/templates/steps/publish-artifact.yml@self
254- # parameters:
255- # path: $(sourceBuildIdOutputDir)
256- # artifactName: source-build-id
257- # displayName: 🟪 Publish Source Build ID Artifact
258- # internalProjectName: ${{ parameters.internalProjectName }}
259- # publicProjectName: ${{ parameters.publicProjectName }}
253+ - template : /eng/common/templates/steps/publish-artifact.yml@self
254+ parameters :
255+ path : $(sourceBuildIdOutputDir)
256+ artifactName : source-build-id
257+ displayName : 🟪 Publish Source Build ID Artifact
258+ internalProjectName : ${{ parameters.internalProjectName }}
259+ publicProjectName : ${{ parameters.publicProjectName }}
0 commit comments