Skip to content

Commit 600bf16

Browse files
committed
Reduce diffs
1 parent a29cfc2 commit 600bf16

6 files changed

Lines changed: 21 additions & 25 deletions

File tree

eng/common/templates/jobs/publish.yml

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- pwsh: |
4242
$azdoOrgName = Split-Path -Leaf $Env:SYSTEM_COLLECTIONURI
4343
echo "##vso[task.setvariable variable=azdoOrgName]$azdoOrgName"
44-
displayName: 🟪 Set Publish Variables
44+
displayName: Set Publish Variables
4545
4646
- ${{ parameters.customInitSteps }}
4747

@@ -65,20 +65,16 @@ jobs:
6565
- template: /eng/common/templates/steps/set-dry-run.yml@self
6666

6767
- script: echo "##vso[task.setvariable variable=imageQueueTime]$(date --rfc-2822)"
68-
displayName: 🟪 Set Publish Variables
68+
displayName: Set Publish Variables
6969

7070
- script: >
7171
$(runImageBuilderCmd) trimUnchangedPlatforms
7272
'$(imageInfoContainerDir)/image-info.json'
73-
displayName: 🟪 Trim Unchanged Images
74-
75-
- script: >
76-
cat $(imageInfoHostDir)/image-info.json
77-
displayName: 🟪 Show Image Info Artifact
73+
displayName: Trim Unchanged Images
7874
7975
- template: /eng/common/templates/steps/run-imagebuilder.yml@self
8076
parameters:
81-
displayName: 🟪⚠️ Copy Images
77+
displayName: Copy Images
8278
serviceConnection: $(publish.serviceConnectionName)
8379
internalProjectName: ${{ parameters.internalProjectName }}
8480
args: >
@@ -97,7 +93,7 @@ jobs:
9793
9894
- template: /eng/common/templates/steps/run-imagebuilder.yml@self
9995
parameters:
100-
displayName: 🟪⚠️ Publish Manifest
96+
displayName: Publish Manifest
10197
serviceConnection: $(publish.serviceConnectionName)
10298
internalProjectName: ${{ parameters.internalProjectName }}
10399
dockerClientOS: ${{ parameters.dockerClientOS }}
@@ -115,7 +111,7 @@ jobs:
115111
parameters:
116112
path: $(imageInfoHostDir)
117113
artifactName: image-info-final-$(System.JobAttempt)
118-
displayName: 🟪 Publish Image Info File Artifact
114+
displayName: Publish Image Info File Artifact
119115
internalProjectName: ${{ parameters.internalProjectName }}
120116
publicProjectName: ${{ parameters.publicProjectName }}
121117

@@ -132,14 +128,14 @@ jobs:
132128
condition: and(succeeded(), eq(variables['publishReadme'], 'true'))
133129

134130
- script: mkdir -p $(Build.ArtifactStagingDirectory)/eol-annotation-data
135-
displayName: 🟪 Create EOL Annotation Data Directory
131+
displayName: Create EOL Annotation Data Directory
136132

137133
- script: >
138134
curl -fSL
139135
--output $(imageInfoHostDir)/full-image-info-orig.json
140136
https://raw.githubusercontent.com/$(gitHubVersionsRepoInfo.org)/$(gitHubVersionsRepoInfo.repo)/refs/heads/$(gitHubVersionsRepoInfo.branch)/$(gitHubImageInfoVersionsPath)
141137
condition: and(succeeded(), eq(variables['publishImageInfo'], 'true'))
142-
displayName: 🟪 Download Latest Image Info
138+
displayName: Download Latest Image Info
143139
144140
- script: >
145141
$(runImageBuilderCmd) mergeImageInfo
@@ -151,11 +147,11 @@ jobs:
151147
--publish
152148
--initial-image-info-path $(imageInfoContainerDir)/full-image-info-orig.json
153149
condition: and(succeeded(), eq(variables['publishImageInfo'], 'true'))
154-
displayName: 🟪⚠️ Merge Image Info
150+
displayName: Merge Image Info
155151
156152
- template: /eng/common/templates/steps/run-imagebuilder.yml@self
157153
parameters:
158-
displayName: 🟪⚠️ Ingest Kusto Image Info
154+
displayName: Ingest Kusto Image Info
159155
serviceConnection: $(kusto.serviceConnectionName)
160156
internalProjectName: ${{ parameters.internalProjectName }}
161157
condition: and(succeeded(), eq(variables['ingestKustoImageInfo'], 'true'))
@@ -173,7 +169,7 @@ jobs:
173169
174170
- template: /eng/common/templates/steps/run-imagebuilder.yml@self
175171
parameters:
176-
displayName: 🟪⚠️ Generate EOL Annotation Data
172+
displayName: Generate EOL Annotation Data
177173
serviceConnection: $(publish.serviceConnectionName)
178174
internalProjectName: internal
179175
condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
@@ -191,7 +187,7 @@ jobs:
191187
parameters:
192188
path: $(Build.ArtifactStagingDirectory)/eol-annotation-data
193189
artifactName: eol-annotation-data-$(System.JobAttempt)
194-
displayName: 🟪 Publish EOL Annotation Data Artifact
190+
displayName: Publish EOL Annotation Data Artifact
195191
internalProjectName: internal
196192
publicProjectName: public
197193
condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
@@ -214,7 +210,7 @@ jobs:
214210
$(dryRunArg)
215211
$(imageBuilder.commonCmdArgs)
216212
condition: and(succeeded(), eq(variables['publishImageInfo'], 'true'))
217-
displayName: 🟪⚠️ Publish Image Info
213+
displayName: Publish Image Info
218214
219215
- script: >
220216
$(runImageBuilderCmd) postPublishNotification
@@ -241,19 +237,19 @@ jobs:
241237
--task "Wait for Annotation Ingestion (Authenticated)"
242238
$(dryRunArg)
243239
$(imageBuilder.commonCmdArgs)
244-
displayName: 🟪⚠️ Post Publish Notification
240+
displayName: Post Publish Notification
245241
condition: and(always(), eq(variables['publishNotificationsEnabled'], 'true'))
246242
247243
- powershell: |
248244
New-Item -ItemType Directory -Path $(sourceBuildIdOutputDir)
249245
Set-Content -Path $(sourceBuildIdOutputDir)/source-build-id.txt -Value ${{ parameters.sourceBuildPipelineRunId }}
250246
condition: succeeded()
251-
displayName: 🟪 Write Source Build ID to File
247+
displayName: Write Source Build ID to File
252248
253249
- template: /eng/common/templates/steps/publish-artifact.yml@self
254250
parameters:
255251
path: $(sourceBuildIdOutputDir)
256252
artifactName: source-build-id
257-
displayName: 🟪 Publish Source Build ID Artifact
253+
displayName: Publish Source Build ID Artifact
258254
internalProjectName: ${{ parameters.internalProjectName }}
259255
publicProjectName: ${{ parameters.publicProjectName }}

eng/common/templates/stages/dotnet/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ stages:
3636
$repoName = $repoName.Substring($orgSeparatorIndex + 1)
3737
}
3838
echo "##vso[task.setvariable variable=publishNotificationRepoName]$repoName"
39-
displayName: 🟪 "Set Custom Repo Name Var"
39+
displayName: "Set Custom Repo Name Var"
4040
- ${{ parameters.customPublishInitSteps }}
4141

4242
${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}:

eng/common/templates/steps/publish-readmes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
--git-path 'teams'
2121
$(additionalPublishMcrDocsArgs)
2222
name: PublishReadmes
23-
displayName: 🟪⚠️ Publish Readmes
23+
displayName: Publish Readmes
2424
condition: ${{ parameters.condition }}
2525
- template: /eng/common/templates/steps/wait-for-mcr-doc-ingestion.yml@self
2626
parameters:

eng/common/templates/steps/wait-for-mcr-doc-ingestion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
steps:
77
- template: /eng/common/templates/steps/run-imagebuilder.yml@self
88
parameters:
9-
displayName: 🟪⚠️ Wait for MCR Doc Ingestion
9+
displayName: Wait for MCR Doc Ingestion
1010
condition: and(${{ parameters.condition }}, eq(variables['waitForIngestionEnabled'], 'true'))
1111
serviceConnection: $(marStatus.serviceConnectionName)
1212
internalProjectName: 'internal'

eng/common/templates/steps/wait-for-mcr-image-ingestion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
steps:
88
- template: /eng/common/templates/steps/run-imagebuilder.yml@self
99
parameters:
10-
displayName: 🟪⚠️ Wait for Image Ingestion
10+
displayName: Wait for Image Ingestion
1111
condition: and(${{ parameters.condition }}, eq(variables['waitForIngestionEnabled'], 'true'))
1212
serviceConnection: $(marStatus.serviceConnectionName)
1313
internalProjectName: 'internal'

eng/pipelines/release-promotion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ extends:
3030

3131
customPublishInitSteps:
3232
- script: echo "##vso[task.setvariable variable=sourceBuildId]$(resources.pipeline.dotnet-docker-release-staging.runID)"
33-
displayName: 🟪 Set sourceBuildId
33+
displayName: Set sourceBuildId

0 commit comments

Comments
 (0)