Skip to content

Commit dfa4b67

Browse files
dotnet-docker-botdotnet-docker-bot
committed
Update common Docker engineering infrastructure with latest
1 parent b1c0cf4 commit dfa4b67

5 files changed

Lines changed: 19 additions & 17 deletions

File tree

‎eng/common/templates/jobs/build-images.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
# all we need is for that value to be in a PowerShell variable, we can get that by the fact that AzDO automatically creates
5050
# the environment variable for us.
5151
$imageBuilderBuildArgs = "$env:IMAGEBUILDERBUILDARGS $(imageBuilder.queueArgs) --image-info-output-path $(imageInfoContainerDir)/$(legName)-image-info.json $(commonMatrixAndBuildOptions)"
52-
if ($env:SYSTEM_TEAMPROJECT -eq "${{ parameters.internalProjectName }}" -and $env:BUILD_REASON -ne "PullRequest" -and "${{ parameters.isInternalServicingValidation }}" -ne "true") {
52+
if ($env:SYSTEM_TEAMPROJECT -eq "${{ parameters.internalProjectName }}" -and $env:BUILD_REASON -ne "PullRequest") {
5353
$imageBuilderBuildArgs = "$imageBuilderBuildArgs --repo-prefix $(stagingRepoPrefix) --push"
5454
}
5555
@@ -70,6 +70,11 @@ jobs:
7070
id: $(build.serviceConnection.id)
7171
tenantId: $(build.serviceConnection.tenantId)
7272
clientId: $(build.serviceConnection.clientId)
73+
- ${{ if eq(parameters.isInternalServicingValidation, true) }}:
74+
- name: storage
75+
id: $(dotnetstaging.serviceConnection.id)
76+
tenantId: $(dotnetstaging.serviceConnection.tenantId)
77+
clientId: $(dotnetstaging.serviceConnection.clientId)
7378
internalProjectName: ${{ parameters.internalProjectName }}
7479
dockerClientOS: ${{ parameters.dockerClientOS }}
7580
args: >-
@@ -92,7 +97,7 @@ jobs:
9297
displayName: Publish Image Info File Artifact
9398
internalProjectName: ${{ parameters.internalProjectName }}
9499
publicProjectName: ${{ parameters.publicProjectName }}
95-
- ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest'), eq(parameters.isInternalServicingValidation, 'false')) }}:
100+
- ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}:
96101
# The following task depends on the SBOM Manifest Generator task installed on the agent.
97102
# This task is auto-injected by 1ES Pipeline Templates so we don't need to install it ourselves.
98103
- powershell: |
@@ -144,11 +149,11 @@ jobs:
144149
}
145150
displayName: Generate SBOMs
146151
condition: and(succeeded(), ne(variables['BuildImages.builtImages'], ''))
147-
- ${{ if or(eq(variables['Build.Reason'], 'PullRequest'), eq(parameters.isInternalServicingValidation, 'true')) }}:
152+
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
148153
- template: /eng/common/templates/jobs/${{ format('../steps/test-images-{0}-client.yml', parameters.dockerClientOS) }}@self
149154
parameters:
150155
condition: ne(variables.testScriptPath, '')
151-
- ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest'), eq(parameters.isInternalServicingValidation, 'false')) }}:
156+
- ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}:
152157
- template: /eng/common/templates/steps/publish-artifact.yml@self
153158
parameters:
154159
path: $(sbomDirectory)

‎eng/common/templates/stages/build-and-test.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ stages:
5151
condition: and(succeeded(), contains(variables['stages'], 'build'))
5252
dependsOn: []
5353
jobs:
54+
5455
- template: /eng/common/templates/jobs/test-images-linux-client.yml@self
5556
parameters:
5657
name: PreBuildValidation
@@ -69,12 +70,14 @@ stages:
6970
echo "##vso[task.setvariable variable=osVersions]"
7071
echo "##vso[task.setvariable variable=architecture]"
7172
displayName: Initialize Test Variables
73+
7274
- template: /eng/common/templates/jobs/copy-base-images-staging.yml@self
7375
parameters:
7476
name: CopyBaseImages
7577
pool: ${{ parameters.linuxAmd64Pool }}
7678
additionalOptions: "--manifest '$(manifest)' $(imageBuilder.pathArgs) $(manifestVariables)"
7779
customInitSteps: ${{ parameters.customCopyBaseImagesInitSteps }}
80+
7881
- template: /eng/common/templates/jobs/generate-matrix.yml@self
7982
parameters:
8083
matrixType: ${{ parameters.buildMatrixType }}
@@ -90,7 +93,7 @@ stages:
9093
noCache: ${{ parameters.noCache }}
9194
internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
9295
publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
93-
isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
96+
9497
- template: /eng/common/templates/jobs/build-images.yml@self
9598
parameters:
9699
name: Linux_amd64
@@ -104,7 +107,6 @@ stages:
104107
noCache: ${{ parameters.noCache }}
105108
internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
106109
publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
107-
isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
108110
customInitSteps: ${{ parameters.customBuildInitSteps }}
109111
noCache: ${{ parameters.noCache }}
110112
internalProjectName: ${{ parameters.internalProjectName }}
@@ -123,7 +125,6 @@ stages:
123125
noCache: ${{ parameters.noCache }}
124126
internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
125127
publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
126-
isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
127128
customInitSteps: ${{ parameters.customBuildInitSteps }}
128129
noCache: ${{ parameters.noCache }}
129130
internalProjectName: ${{ parameters.internalProjectName }}
@@ -142,7 +143,6 @@ stages:
142143
noCache: ${{ parameters.noCache }}
143144
internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
144145
publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
145-
isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
146146
customInitSteps: ${{ parameters.customBuildInitSteps }}
147147
noCache: ${{ parameters.noCache }}
148148
internalProjectName: ${{ parameters.internalProjectName }}
@@ -161,7 +161,6 @@ stages:
161161
noCache: ${{ parameters.noCache }}
162162
internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
163163
publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
164-
isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
165164
customInitSteps: ${{ parameters.customBuildInitSteps }}
166165
noCache: ${{ parameters.noCache }}
167166
internalProjectName: ${{ parameters.internalProjectName }}
@@ -180,7 +179,6 @@ stages:
180179
noCache: ${{ parameters.noCache }}
181180
internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
182181
publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
183-
isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
184182
customInitSteps: ${{ parameters.customBuildInitSteps }}
185183
noCache: ${{ parameters.noCache }}
186184
internalProjectName: ${{ parameters.internalProjectName }}
@@ -199,7 +197,6 @@ stages:
199197
noCache: ${{ parameters.noCache }}
200198
internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
201199
publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
202-
isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
203200
customInitSteps: ${{ parameters.customBuildInitSteps }}
204201
noCache: ${{ parameters.noCache }}
205202
internalProjectName: ${{ parameters.internalProjectName }}
@@ -220,7 +217,6 @@ stages:
220217
noCache: ${{ parameters.noCache }}
221218
internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
222219
publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
223-
isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
224220
customInitSteps: ${{ parameters.customBuildInitSteps }}
225221
noCache: ${{ parameters.noCache }}
226222
internalProjectName: ${{ parameters.internalProjectName }}
@@ -243,7 +239,7 @@ stages:
243239
################################################################################
244240
# Test Images
245241
################################################################################
246-
- ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest'), eq(parameters.isInternalServicingValidation, 'false')) }}:
242+
- ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}:
247243
- stage: Test
248244
dependsOn: Post_Build
249245
condition: "

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ parameters:
2020
stages:
2121
- ${{ if eq(parameters.isInternalServicingValidation, 'false') }}:
2222
- stage: Publish
23-
${{ if not(parameters.isStandalonePublish) }}:
23+
${{ if eq(parameters.isStandalonePublish, true) }}:
24+
dependsOn: []
25+
${{ else }}:
2426
${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}:
2527
dependsOn: Test
2628
${{ else }}:

‎eng/common/templates/steps/common-init-for-matrix-and-build.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ parameters:
33
internalVersionsRepoRef: null
44
publicVersionsRepoRef: null
55
versionsRepoPath: versions
6-
isInternalServicingValidation: false
76

87
steps:
98
- checkout: self
@@ -15,7 +14,7 @@ steps:
1514
path: s/${{ parameters.versionsRepoPath }}
1615
- powershell: |
1716
$commonMatrixAndBuildOptions = "--source-repo $(publicGitRepoUri)"
18-
if ("$(System.TeamProject)" -eq "internal" -and "$(Build.Reason)" -ne "PullRequest" -and "${{ parameters.isInternalServicingValidation }}" -ne "true") {
17+
if ("$(System.TeamProject)" -eq "internal" -and "$(Build.Reason)" -ne "PullRequest") {
1918
$commonMatrixAndBuildOptions = "$commonMatrixAndBuildOptions --source-repo-prefix $(mirrorRepoPrefix) --registry-override $(acr-staging.server)"
2019
}
2120

‎eng/common/templates/variables/docker-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2744543
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2749906
33
imageNames.imageBuilder: $(imageNames.imageBuilderName)
44
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
55
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner

0 commit comments

Comments
 (0)