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

Dedicated storage agent pool #19191

Closed
wants to merge 1 commit into from
Closed

Dedicated storage agent pool #19191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 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 @@ -5,23 +5,23 @@
},
"matrix": {
"Agent": {
"ubuntu-18.04": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" },
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
"ubuntu-18.04": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-storage" },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @benbp

@mitchdenny what strategy are you thinking about for overriding the pools we use here? Should we enable some way to override these values in the template instead of requiring that folks duplicate the entire matrix.json file?

Copy link
Member

@benbp benbp Mar 4, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weshaggard when I was trying to show the pool override alternative to @mitchdenny , I found a small bug that made it not work :)

With the current import + override behavior (predicated on the above bug fix), this is what it could look like:

{
  "matrix": {
    "$IMPORT": "./eng/pipelines/templates/stages/platform-matrix.json",
    "PoolOverride": {
      "StorageLinuxPool": { "Pool": "azsdk-pool-mms-ubuntu-1804-storage" },
      "StorageWinPool": { "Pool": "azsdk-pool-mms-win-2019-storage" },
      "HostedMacPool": { "Pool": "Azure Pipelines" }
    }
  },
  "exclude": [
    {
      "Pool": "azsdk-pool-mms-ubuntu-1804-storage",
      "OSVmImage": [ "MMS2019", "MacOS-10.15" ]
    },
    {
      "Pool": "azsdk-pool-mms-win-2019-storage",
      "OSVmImage": [ "MMSUbuntu18.04", "MacOS-10.15" ]
    },
    {
      "Pool": "Azure Pipelines",
      "OSVmImage": [ "MMS2019", "MMSUbuntu18.04" ]
    }
  ]
}

It might be worth thinking about a replace type operator in the config for this kind of scenario.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix for the bug I mentioned: Azure/azure-sdk-tools#1461

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it might be interesting to have some sort of replace operator that could update the entire agent based on the name of the agent.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me sketch something out.

"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-storage" },
"macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
},
"TestTargetFramework": [ "netcoreapp2.1", "net5.0" ]
},
"include": [
{
"Agent": {
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-storage" }
},
"TestTargetFramework": [ "net461", "net5.0" ],
"AdditionalTestArguments": "/p:UseProjectReferenceToAzureClients=true"
},
{
"Agent": {
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-storage" }
},
"TestTargetFramework": "netcoreapp2.1",
"SupportsRecording": true
Expand Down