Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Where applicable, update Windows pools used to azsdk-pool-mms-win-2022-general and rename vmImage to the windows-20xx format #34163

Merged
merged 4 commits into from
Feb 17, 2023
Merged

Where applicable, update Windows pools used to azsdk-pool-mms-win-2022-general and rename vmImage to the windows-20xx format #34163

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
238da12
update MMS2022 images to Compliant
Feb 15, 2023
6c4e402
Update eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml
Feb 15, 2023
9a61cd1
ongoing
Feb 17, 2023
17812d7
ongoing
Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/pipelines/aggregate-reports.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pr:

pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant

variables:
- template: templates/variables/globals.yml
Expand Down
12 changes: 6 additions & 6 deletions eng/pipelines/templates/jobs/ci.mgmt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
parameters:
parameters:
- name: ShouldPublish
type: boolean
default: false
Expand All @@ -11,7 +11,7 @@ jobs:
timeoutInMinutes: 100
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant
steps:
#- script: "echo $(system.pullrequest.pullrequestnumber), https://github.com/$(build.repository.id), https://github.com/$(build.repository.ID)"
- template: /eng/pipelines/templates/steps/install-dotnet.yml
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
OSVmImage: "MMSUbuntu20.04"
Windows:
Pool: azsdk-pool-mms-win-2022-general
OSVmImage: MMS2022
OSVmImage: MMS2022Compliant
MacOs:
Pool: Azure Pipelines
OSVmImage: "macos-11"
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
- Build
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant
steps:
- task: UsePythonVersion@0
displayName: "Use Python 3.6"
Expand All @@ -111,8 +111,8 @@ jobs:
- job: Compliance
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
steps:
vmImage: MMS2022Compliant
steps:
- template: /eng/common/pipelines/templates/steps/credscan.yml
parameters:
BaselineFilePath: $(Build.sourcesdirectory)/eng/dotnet.gdnbaselines
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- job: Build
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant

variables:
Codeql.Enabled: true
Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:
- job: Compliance
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant
steps:
- task: UsePythonVersion@0
displayName: "Use Python 3.6"
Expand Down
14 changes: 7 additions & 7 deletions eng/pipelines/templates/jobs/mgmt-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
parameters:
parameters:
- name: BuildToolsPath
type: string
default: '$(Build.SourcesDirectory)/azure-sdk-build-tools'
Expand All @@ -21,8 +21,8 @@ jobs:
dependsOn: ${{ parameters.DependsOn }}
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant

steps:
- checkout: self

Expand All @@ -31,7 +31,7 @@ jobs:
- download: current
artifact: packages
displayName: Download published Nuget Packages

- template: pipelines/steps/net-signing.yml@azure-sdk-build-tools
parameters:
PackagesPath: '$(PIPELINE.WORKSPACE)/packages'
Expand Down Expand Up @@ -69,17 +69,17 @@ jobs:
displayName: 'Use NuGet ${{ parameters.NugetVersion }}'
inputs:
versionSpec: ${{ parameters.NugetVersion }}

- task: NuGetCommand@2
displayName: 'Publish to Nuget'
inputs:
command: push
packagesToPush: '$(PIPELINE.WORKSPACE)/packages/**/*.nupkg;!$(PIPELINE.WORKSPACE)/packages/**/*.symbols.nupkg'
nuGetFeedType: external
publishFeedCredentials: Nuget.org

- ${{ if eq(parameters.ShouldPublishToDevOps, 'true') }}:

- pwsh: |
# For safety default to publishing to the private feed.
# Publish to https://dev.azure.com/azure-sdk/internal/_packaging?_a=feed&feed=azure-sdk-for-net-pr
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/templates/jobs/smoke.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ jobs:
TestTargetFramework: net6.0
Windows_NetFramework:
Pool: "azsdk-pool-mms-win-2022-general"
OSVmImage: "MMS2022"
OSVmImage: "MMS2022Compliant"
TestTargetFramework: net461
Windows_Net60:
Pool: "azsdk-pool-mms-win-2022-general"
OSVmImage: "MMS2022"
OSVmImage: "MMS2022Compliant"
TestTargetFramework: net6.0
Windows_Net70:
Pool: "azsdk-pool-mms-win-2022-general"
OSVmImage: "MMS2022"
OSVmImage: "MMS2022Compliant"
TestTargetFramework: net7.0
pool:
name: $(Pool)
Expand Down
12 changes: 6 additions & 6 deletions eng/pipelines/templates/stages/archetype-net-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ stages:
environment: esrp
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant

strategy:
runOnce:
Expand Down Expand Up @@ -53,7 +53,7 @@ stages:

pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant

strategy:
runOnce:
Expand Down Expand Up @@ -131,7 +131,7 @@ stages:

pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant

strategy:
runOnce:
Expand Down Expand Up @@ -191,7 +191,7 @@ stages:

pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant

strategy:
runOnce:
Expand All @@ -217,7 +217,7 @@ stages:

pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant

strategy:
runOnce:
Expand Down Expand Up @@ -255,7 +255,7 @@ stages:
displayName: Publish package to daily feed
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant
steps:
- checkout: none
- template: tools/clone-buildtools/clone-buildtools.yml@azure-sdk-build-tools
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ stages:
matrix:
Windows:
Pool: 'azsdk-pool-mms-win-2022-general'
Image: 'MMS2022'
Image: 'MMS2022Compliant'
Linux:
Pool: 'azsdk-pool-mms-ubuntu-2004-general'
Image: 'MMSUbuntu20.04'
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/templates/stages/platform-matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"TestTargetFramework": "net7.0"
},
"Windows2022_NET461": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net461"
},
"Windows2022_NET7.0": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net7.0"
},
Expand Down Expand Up @@ -49,7 +49,7 @@
{
"Agent": {
"Windows2022_NET7.0": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net7.0"
}
Expand Down
6 changes: 3 additions & 3 deletions eng/scripts/splittestdependencies/tests/expectOutputs/expect-matrix-integration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"TestTargetFramework": "net6.0"
},
"windows2022_NET6.0": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net6.0"
},
"windows2022_NET461": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net461"
},
Expand Down Expand Up @@ -75,7 +75,7 @@
{
"Agent": {
"windows2022": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "netcoreapp3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/splittestdependencies/tests/expectOutputs/expect-matrix1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{
"Agent": {
"windows2022": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "netcoreapp3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/splittestdependencies/tests/expectOutputs/expect-matrix2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
{
"Agent": {
"windows2022": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "netcoreapp3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/splittestdependencies/tests/inputs/platform-matrix1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{
"Agent": {
"windows2022": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "netcoreapp3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/splittestdependencies/tests/inputs/platform_2_include_agents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{
"Agent": {
"windows2022": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "netcoreapp3.1"
}
Expand Down
6 changes: 3 additions & 3 deletions eng/scripts/splittestdependencies/tests/inputs/sync-platform-matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"TestTargetFramework": "net6.0"
},
"windows2022_NET6.0": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net6.0"
},
"windows2022_NET461": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net461"
},
Expand Down Expand Up @@ -49,7 +49,7 @@
{
"Agent": {
"windows2022": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "netcoreapp3.1"
}
Expand Down
6 changes: 3 additions & 3 deletions sdk/communication/Azure.Communication.PhoneNumbers/phone-numbers-livetest-matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
},

"windows2022_NET6.0": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net6.0",
"SKIP_UPDATE_CAPABILITIES_LIVE_TESTS": "TRUE"
},
"windows2022_NET461": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net461",
"SKIP_UPDATE_CAPABILITIES_LIVE_TESTS": "TRUE"
Expand Down Expand Up @@ -56,7 +56,7 @@
{
"Agent": {
"Windows2022": {
"OSVmImage": "MMS2022",
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net7.0"
}
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/platform-matrix-all-versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"Pool": "azsdk-pool-mms-ubuntu-2004-storage"
},
"windows-2022": {
"OSVmImage": "MMS2022",
"Pool": "azsdk-pool-mms-win-2019-storage"
"OSVmImage": "MMS2022Compliant",
"Pool": "azsdk-pool-mms-win-2022-storage"
}
},
"TestTargetFramework": [
Expand Down