Skip to content

Update ubuntu VM image #15706

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

Merged
chidozieononiwu merged 4 commits into from
Jun 23, 2021
Merged

Update ubuntu VM image #15706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3e1007
Update ubuntu vm image
chidozieononiwu Jun 11, 2021
9a02a99
Update vmImage names
chidozieononiwu Jun 11, 2021
9ec9f71
Update platform-matric.json
chidozieononiwu Jun 23, 2021
713a613
Update platform-matric.json
chidozieononiwu Jun 23, 2021
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 common/tools/eslint-plugin-azure-sdk/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- template: /eng/pipelines/templates/variables/globals.yml

pool:
vmImage: 'Ubuntu 18.04'
vmImage: 'Ubuntu 20.04'

steps:
- template: /eng/pipelines/templates/steps/common.yml
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/docindex.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:

- job: UpdateDocsMsBuildConfig
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
variables:
DocRepoLocation: $(Pipeline.Workspace)/docs
DocRepoOwner: MicrosoftDocs
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/mgmt-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ jobs:
- job: 'Build'

pool:
vmImage: 'Ubuntu 16.04'
vmImage: 'Ubuntu 20.04'
Copy link
Copy Markdown
Member

@weshaggard weshaggard Jun 23, 2021

Choose a reason for hiding this comment

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

We might need to ask the mgmt team about this change.


steps:
- task: NodeTool@0
Expand Down Expand Up @@ -236,7 +236,7 @@ jobs:
- job: 'Analyze'

pool:
vmImage: 'Ubuntu 16.04'
vmImage: 'Ubuntu 20.04'

steps:
- task: NodeTool@0
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/mgmt-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ jobs:
- job: Build
displayName: Build auto-generated projects
pool:
vmImage: Ubuntu 16.04
vmImage: Ubuntu 20.04
steps:
- task: NodeTool@0
inputs:
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/templates/jobs/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:
- template: ../variables/globals.yml

pool:
name: azsdk-pool-mms-ubuntu-1804-general
vmImage: MMSUbuntu18.04
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04

steps:
- script: |
Expand All @@ -48,8 +48,8 @@ jobs:
- template: ../variables/globals.yml

pool:
name: azsdk-pool-mms-ubuntu-1804-general
vmImage: MMSUbuntu18.04
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04

steps:
- template: ../steps/common.yml
Expand Down
12 changes: 6 additions & 6 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 @@ -15,8 +15,8 @@ jobs:
variables:
- template: /eng/pipelines/templates/variables/globals.yml
pool:
name: "azsdk-pool-mms-ubuntu-1804-general"
vmImage: "MMSUbuntu18.04"
name: "azsdk-pool-mms-ubuntu-2004-general"
vmImage: "MMSUbuntu20.04"
displayName: Check Smoke Test Eligibility
steps:
- template: /eng/pipelines/templates/steps/use-node-version.yml
Expand Down Expand Up @@ -65,14 +65,14 @@ jobs:
ArmTemplateParameters: $(AzureCloudArmTemplateParameters)
NodeTestVersion: "12.x"
Linux Node14 (AzureCloud):
Pool: "azsdk-pool-mms-ubuntu-1804-general"
OSVmImage: "MMSUbuntu18.04"
Pool: "azsdk-pool-mms-ubuntu-2004-general"
OSVmImage: "MMSUbuntu20.04"
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ArmTemplateParameters: $(AzureCloudArmTemplateParameters)
NodeTestVersion: "14.x"
Linux Node16 (AzureCloud):
Pool: "azsdk-pool-mms-ubuntu-1804-general"
OSVmImage: "MMSUbuntu18.04"
Pool: "azsdk-pool-mms-ubuntu-2004-general"
OSVmImage: "MMSUbuntu20.04"
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ArmTemplateParameters: $(AzureCloudArmTemplateParameters)
NodeTestVersion: "16.x"
Expand Down
16 changes: 8 additions & 8 deletions eng/pipelines/templates/stages/archetype-js-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ stages:
environment: github

pool:
name: azsdk-pool-mms-ubuntu-1804-general
vmImage: MMSUbuntu18.04
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04

strategy:
runOnce:
Expand Down Expand Up @@ -62,8 +62,8 @@ stages:
dependsOn: TagRepository

pool:
name: azsdk-pool-mms-ubuntu-1804-general
vmImage: MMSUbuntu18.04
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04

strategy:
runOnce:
Expand Down Expand Up @@ -181,8 +181,8 @@ stages:
dependsOn: PublishPackage

pool:
name: azsdk-pool-mms-ubuntu-1804-general
vmImage: MMSUbuntu18.04
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04

strategy:
runOnce:
Expand Down Expand Up @@ -225,8 +225,8 @@ stages:
condition: or(eq(variables['SetDevVersion'], 'true'), and(eq(variables['SetDevVersion'], ''), eq(variables['Build.Reason'],'Schedule'), eq(variables['System.TeamProject'], 'internal')))
displayName: Publish package to daily feed
pool:
name: azsdk-pool-mms-ubuntu-1804-general
vmImage: MMSUbuntu18.04
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
steps:
- checkout: self
- download: current
Expand Down
49 changes: 39 additions & 10 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 @@ -4,29 +4,58 @@
},
"matrix": {
"Agent": {
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
"ubuntu-18.04": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" },
"macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
"windows-2019": {
"OSVmImage": "MMS2019",
"Pool": "azsdk-pool-mms-win-2019-general"
},
"ubuntu-20.04": {
"OSVmImage": "MMSUbuntu20.04",
"Pool": "azsdk-pool-mms-ubuntu-2004-general"
},
"macOS-10.15": {
"OSVmImage": "macOS-10.15",
"Pool": "Azure Pipelines"
}
},
"NodeTestVersion": [ "10.x", "12.x", "14.x", "16.x" ],
"NodeTestVersion": ["10.x", "12.x", "14.x", "16.x"],
"TestType": "node",
"TestResultsFiles": "**/test-results.xml"
},
"include": [
{
"Agent": { "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } },
"Agent": {
"windows-2019": {
"OSVmImage": "MMS2019",
"Pool": "azsdk-pool-mms-win-2019-general"
}
},
"Scenario": {
"coverage": { "TestType": "node", "TestResultsFiles": "**/test-results.xml", "PublishCodeCoverage": "true" },
"sample": { "TestType": "sample", "TestResultsFiles": "**/test-results.xml" },
"browser": { "TestType": "browser", "TestResultsFiles": "**/test-results.browser.xml" }
"coverage": {
"TestType": "node",
"TestResultsFiles": "**/test-results.xml",
"PublishCodeCoverage": "true"
},
"sample": {
"TestType": "sample",
"TestResultsFiles": "**/test-results.xml"
},
"browser": {
"TestType": "browser",
"TestResultsFiles": "**/test-results.browser.xml"
}
},
"NodeTestVersion": "12.x"
},
{
"Agent": { "ubuntu-18.04": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" } },
"Agent": {
"ubuntu-20.04": {
"OSVmImage": "MMSUbuntu20.04",
"Pool": "azsdk-pool-mms-ubuntu-2004-general"
}
},
"TestType": "node",
"NodeTestVersion": "12.x",
"DependencyVersion": [ "max", "min" ],
"DependencyVersion": ["max", "min"],
"TestResultsFiles": "**/test-results.xml"
}
]
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/variables/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
DocWardenVersion: '0.5.0'
NodeVersion: "14.x"
OSVmImage: "ubuntu-18.04"
OSVmImage: "ubuntu-20.04"
Copy link
Copy Markdown
Member

@weshaggard weshaggard Jun 22, 2021

Choose a reason for hiding this comment

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

Can you check where we use this? It is sort of a different pattern then other repos and if we don't use it I would suggest removing it.

Copy link
Copy Markdown
Member Author

@chidozieononiwu chidozieononiwu Jun 23, 2021

Choose a reason for hiding this comment

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

I believe it is being used here

azure-sdk-for-js/eng/pipelines/templates/jobs/ci.tests.yml

Line 39 in e823b26

vmImage: $(OSVmImage)

Copy link
Copy Markdown
Member

@weshaggard weshaggard Jun 23, 2021

Choose a reason for hiding this comment

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

I think that is coming the matrix but I could be wrong.

Copy link
Copy Markdown
Member

@weshaggard weshaggard Jun 23, 2021

Choose a reason for hiding this comment

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

In any case it doesn't necessarily hurt to have it but we don't need it we should remove it.

skipComponentGovernanceDetection: true
coalesceResultFilter: $[ coalesce(variables['packageGlobFilter'], '**') ]
ServiceVersion: ""