8000 Move from `PkgES` hosted agents to 1ES hosted agents (#16023) · PowerShell/PowerShell@15f2730 · GitHub
[go: up one dir, main page]
Skip to content

Commit 15f2730

Browse files
adityapatwardhanadityapatwardhan
authored
Move from PkgES hosted agents to 1ES hosted agents (#16023)
1 parent 6de53f8 commit 15f2730

12 files changed

+46
-13
lines changed

‎tools/releaseBuild/azureDevOps/releaseBuild.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,9 @@ stages:
189189
- job: release_json
190190
displayName: Create and Upload release.json
191191
pool:
192-
vmImage: 'windows-latest'
192+
name: PowerShell1ES
193+
demands:
194+
- ImageOverride -equals MMS2019
193195
steps:
194196
- checkout: self
195197
clean: true

‎tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ jobs:
88
- group: Azure Blob variable group
99
displayName: Delete blob is exists
1010
pool:
11-
vmImage: windows-latest
11+
name: PowerShell1ES
12+
demands:
13+
- ImageOverride -equals MMS2019
1214
steps:
1315
- checkout: self
1416
clean: true

‎tools/releaseBuild/azureDevOps/templates/compliance.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,17 @@ jobs:
88
value : false
99
- name: NugetSecurityAnalysisWarningLevel
1010
value: none
11+
12+
# Defines the variables APIScanClient, APIScanTenant and APIScanSecret
13+
- group: PS-PS-APIScan
14+
1115
displayName: Compliance
1216
dependsOn:
1317
${{ parameters.parentJobs }}
1418
pool:
15-
name: Package ES Standard Build
19+
name: PowerShell1ES
20+
demands:
21+
- ImageOverride -equals MMS2019
1622

1723
# APIScan can take a long time
1824
timeoutInMinutes: 180
@@ -115,6 +121,8 @@ jobs:
115121
softwareVersionNum: '$(ReleaseTagVar)'
116122
isLargeApp: false
117123
preserveTempFiles: true
124+
env:
125+
AzureServicesAuthConnectionString: RunAs=App;AppId=$(APIScanClient);TenantId=$(APIScanTenant);AppKey=$(APIScanSecret)
118126
continueOnError: true
119127

120128
- task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2

‎tools/releaseBuild/azureDevOps/templates/json.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ jobs:
1313
${{ parameters.parentJobs }}
1414
condition: succeeded()
1515
pool:
16-
vmImage: windows-latest
16+
name: PowerShell1ES
17+
demands:
18+
- ImageOverride -equals MMS2019
1719

1820
steps:
1921
#- task: <task type name>@<version>

‎tools/releaseBuild/azureDevOps/templates/linux.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ jobs:
88
displayName: Build ${{ parameters.buildName }}
99
condition: succeeded()
1010
pool:
11-
vmImage: ubuntu-16.04
11+
name: PowerShell1ES
12+
demands:
13+
- ImageOverride -equals MMSUbuntu20.04
1214
dependsOn: ${{ parameters.parentJob }}
1315
variables:
1416
- name: runCodesignValidationInjection
@@ -66,7 +68,9 @@ jobs:
6668
dependsOn: build_${{ parameters.buildName }}
6769
condition: succeeded()
6870
pool:
69-
vmImage: windows-latest
71+
name: PowerShell1ES
72+
demands:
73+
- ImageOverride -equals MMS2019
7074
variables:
7175
- name: buildName
7276
value: ${{ parameters.buildName }}

‎tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ jobs:
77
dependsOn: build_macOS_${{ parameters.buildArchitecture }}
88
condition: succeeded()
99
pool:
10-
name: Package ES Standard Build
10+
name: PowerShell1ES
11+
demands:
12+
- ImageOverride -equals MMS2019
1113
variables:
1214
- group: ESRP
1315
- name: runCodesignValidationInjection

‎tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ jobs:
77
dependsOn: package_macOS_${{ parameters.buildArchitecture }}
88
condition: succeeded()
99
pool:
10-
name: Package ES Standard Build
10+
name: PowerShell1ES
11+
demands:
12+
- ImageOverride -equals MMS2019
1113
variables:
1214
- group: ESRP
1315
- name: runCodesignValidationInjection

‎tools/releaseBuild/azureDevOps/templates/nuget.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ jobs:
77
${{ parameters.parentJobs }}
88
displayName: Build NuGet packages
99
condition: succeeded()
10-
pool: Package ES Standard Build
10+
pool:
11+
name: PowerShell1ES
12+
demands:
13+
- ImageOverride -equals MMS2019
1114

1215
timeoutInMinutes: 90
1316

‎tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ jobs:
1010
condition: succeeded()
1111

1212
pool:
13-
name: Package ES Standard Build
13+
name: PowerShell1ES
14+
demands:
15+
- ImageOverride -equals MMS2019
1416

1517
steps:
1618
- checkout: self

‎tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ jobs:
1414
condition: succeeded()
1515
dependsOn: ${{ parameters.parentJob }}
1616
pool:
17-
vmImage: windows-latest
17+
name: PowerShell1ES
18+
demands:
19+
- ImageOverride -equals MMS2019
1820
variables:
1921
- name: runCodesignValidationInjection
2022
value: false

‎tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ jobs:
88
${{ parameters.parentJobs }}
99
condition: succeeded()
1010
pool:
11-
vmImage: windows-latest
11+
name: PowerShell1ES
12+
demands:
13+
- ImageOverride -equals MMS2019
1214
variables:
1315
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
1416
value: 1

‎tools/releaseBuild/azureDevOps/templates/windows-packaging.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ jobs:
1414
condition: succeeded()
1515
dependsOn: ${{ parameters.parentJob }}
1616
pool:
17-
vmImage: windows-latest
17+
name: PowerShell1ES
18+
demands:
19+
- ImageOverride -equals MMS2019
1820
variables:
1921
- name: BuildConfiguration
2022
value: ${{ parameters.BuildConfiguration }}

0 commit comments

Comments
 (0)
0