Skip to content

Commit d182f51

Browse files
scbeddscbedd
committed
re-update archetype-sdk-tests.yml using tool. did I indent the stages wrong?
1 parent 342794e commit d182f51

File tree

1 file changed

+73
-69
lines changed

1 file changed

+73
-69
lines changed

‎eng/pipelines/templates/stages/archetype-sdk-tests.yml‎

Lines changed: 73 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -100,86 +100,90 @@ parameters:
100100
type: boolean
101101
default: false
102102

103-
104103
extends:
105104
${{ if eq(variables['System.TeamProject'], 'internal') }}:
106105
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
107106
${{ else }}:
108107
template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
109108
parameters:
110-
sdl:
111-
sourceAnalysisPool:
112-
name: azsdk-pool-mms-win-2022-1es-pt
113-
image: azsdk-pool-mms-win-2022-1espt
114-
os: windows
115-
codeql:
116-
compiled:
109+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
110+
sdl:
111+
sourceAnalysisPool:
112+
name: azsdk-pool-mms-win-2022-1es-pt
113+
image: azsdk-pool-mms-win-2022-1espt
114+
os: windows
115+
eslint:
117116
enabled: false
118-
justificationForDisabling: "CodeQL times our pipelines out by running for 2+ hours before being force canceled."
119-
psscriptanalyzer:
120-
enabled: true
121-
break: true
122-
policy: M365
123-
credscan:
124-
suppressionsFile: '$(Build.SourcesDirectory)/eng/CredScanSuppression.json'
125-
scanFolder: '$(Build.SourcesDirectory)/credscan.tsv'
126-
toolVersion: '2.3.12.23'
127-
baselineFiles: $(Build.SourcesDirectory)/eng/python.gdnbaselines
117+
justificationForDisabling: 'ESLint injected task has failures because it uses an old version of mkdirp. We should not fail for tools not controlled by the repo. See: https://dev.azure.com/azure-sdk/internal/_build/results?buildId=3499746'
118+
codeql:
119+
compiled:
120+
enabled: false
121+
justificationForDisabling: CodeQL times our pipelines out by running for 2+ hours before being force canceled.
122+
psscriptanalyzer:
123+
compiled: true
124+
break: true
125+
policy: M365
126+
credscan:
127+
suppressionsFile: $(Build.SourcesDirectory)/eng/CredScanSuppression.json
128+
scanFolder: $(Build.SourcesDirectory)/credscan.tsv
129+
toolVersion: 2.3.12.23
130+
baselineFiles: $(Build.SourcesDirectory)/eng/<language>.gdnbaselines
131+
128132
stages:
129133
- ${{ each cloud in parameters.CloudConfig }}:
130-
- ${{ if or(contains(parameters.Clouds, cloud.key), and(contains(variables['Build.DefinitionName'], 'tests-weekly'), contains(parameters.SupportedClouds, cloud.key))) }}:
131-
- ${{ if not(contains(parameters.UnsupportedClouds, cloud.key)) }}:
132-
- stage: ${{ cloud.key }}_${{ parameters.JobName }}
133-
dependsOn: []
134-
jobs:
135-
- template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml@self
136-
parameters:
137-
SparseCheckoutPaths:
138-
# Python recording files are implicit excluded here since they are using '.yaml' file extension.
139-
- "sdk/${{ parameters.ServiceDirectory }}/**/*.json"
140-
JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml
141-
AdditionalParameters:
142-
ServiceDirectory: ${{ parameters.ServiceDirectory }}
143-
TestResourceDirectories: ${{ parameters.TestResourceDirectories }}
144-
PreSteps:
145-
- ${{ parameters.PlatformPreSteps }}
146-
- ${{ parameters.PreSteps }}
147-
PostSteps:
148-
- ${{ parameters.PlatformPostSteps }}
149-
- ${{ parameters.PostSteps }}
150-
EnvVars: ${{ parameters.EnvVars }}
151-
MaxParallel: ${{ parameters.MaxParallel }}
152-
BeforeTestSteps: ${{ parameters.BeforeTestSteps }}
153-
AfterTestSteps: ${{ parameters.AfterTestSteps }}
154-
AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }}
155-
BuildTargetingString: ${{ parameters.BuildTargetingString }}
156-
TestMarkArgument: ${{ parameters.TestMarkArgument }}
157-
InjectedPackages: ${{ parameters.InjectedPackages }}
158-
BuildDocs: ${{ parameters.BuildDocs }}
159-
TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
160-
TestProxy: ${{ parameters.TestProxy }}
161-
MatrixConfigs:
162-
# Enumerate platforms and additional platforms based on supported clouds (sparse platform<-->cloud matrix).
163-
- ${{ each config in parameters.MatrixConfigs }}:
164-
- ${{ config }}
165-
- ${{ each config in parameters.AdditionalMatrixConfigs }}:
166-
- ${{ config }}
167-
MatrixFilters:
168-
- ${{ each cloudFilter in cloud.value.MatrixFilters }}:
169-
- ${{ cloudFilter }}
170-
- ${{ parameters.MatrixFilters }}
171-
MatrixReplace:
172-
- ${{ each cloudReplace in cloud.value.MatrixReplace }}:
173-
- ${{ cloudReplace }}
174-
- ${{ parameters.MatrixReplace }}
175-
CloudConfig:
176-
SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
177-
SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }}
178-
Location: ${{ coalesce(parameters.Location, cloud.value.Location) }}
179-
Cloud: ${{ cloud.key }}
134+
- ${{ if or(contains(parameters.Clouds, cloud.key), and(contains(variables['Build.DefinitionName'], 'tests-weekly'), contains(parameters.SupportedClouds, cloud.key))) }}:
135+
- ${{ if not(contains(parameters.UnsupportedClouds, cloud.key)) }}:
136+
- stage: ${{ cloud.key }}_${{ parameters.JobName }}
137+
dependsOn: []
138+
jobs:
139+
- template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
140+
parameters:
141+
SparseCheckoutPaths:
142+
- sdk/${{ parameters.ServiceDirectory }}/**/*.json
143+
JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml
144+
AdditionalParameters:
145+
ServiceDirectory: ${{ parameters.ServiceDirectory }}
146+
TestResourceDirectories: ${{ parameters.TestResourceDirectories }}
147+
PreSteps:
148+
- ${{ parameters.PlatformPreSteps }}
149+
- ${{ parameters.PreSteps }}
150+
PostSteps:
151+
- ${{ parameters.PlatformPostSteps }}
152+
- ${{ parameters.PostSteps }}
153+
EnvVars: ${{ parameters.EnvVars }}
154+
MaxParallel: ${{ parameters.MaxParallel }}
155+
BeforeTestSteps: ${{ parameters.BeforeTestSteps }}
156+
AfterTestSteps: ${{ parameters.AfterTestSteps }}
157+
AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }}
158+
BuildTargetingString: ${{ parameters.BuildTargetingString }}
159+
TestMarkArgument: ${{ parameters.TestMarkArgument }}
160+
InjectedPackages: ${{ parameters.InjectedPackages }}
161+
BuildDocs: ${{ parameters.BuildDocs }}
162+
TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
163+
TestProxy: ${{ parameters.TestProxy }}
164+
MatrixConfigs:
165+
# Enumerate platforms and additional platforms based on supported clouds (sparse platform<-->cloud matrix).
166+
- ${{ each config in parameters.MatrixConfigs }}:
167+
- ${{ config }}
168+
- ${{ each config in parameters.AdditionalMatrixConfigs }}:
169+
- ${{ config }}
170+
MatrixFilters:
171+
- ${{ each cloudFilter in cloud.value.MatrixFilters }}:
172+
- ${{ cloudFilter }}
173+
- ${{ parameters.MatrixFilters }}
174+
MatrixReplace:
175+
- ${{ each cloudReplace in cloud.value.MatrixReplace }}:
176+
- ${{ cloudReplace }}
177+
- ${{ parameters.MatrixReplace }}
178+
CloudConfig:
179+
SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
180+
SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }}
181+
Location: ${{ coalesce(parameters.Location, cloud.value.Location) }}
182+
Cloud: ${{ cloud.key }}
180183

181-
- template: /eng/pipelines/templates/stages/python-analyze-weekly.yml@self
184+
- template: /eng/pipelines/templates/stages/python-analyze-weekly.yml
182185
parameters:
183186
BuildTargetingString: ${{ parameters.BuildTargetingString }}
184187
ServiceDirectory: ${{ parameters.ServiceDirectory }}
185188
JobName: ${{ parameters.JobName }}
189+

0 commit comments

Comments
 (0)