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.

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

Update Ubuntu images to 1ES-hosted Ubuntu 22.04 in many places #4996

Merged
merged 2 commits into from
Jan 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .azure-pipelines/warden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ jobs:
- job: 'Build'

pool:
vmImage: 'ubuntu-20.04'
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

steps:
- task: UsePythonVersion@0
Expand Down Expand Up @@ -75,7 +76,8 @@ jobs:
dependsOn: 'Build'

pool:
vmImage: 'ubuntu-20.04'
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

steps:

Expand Down
12 changes: 6 additions & 6 deletions eng/containers/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ parameters:
type: object
default:
- name: mock_attestation
pool: 'azsdk-pool-mms-ubuntu-2004-general'
vmImage: 'MMSUbuntu20.04'
pool: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04
dockerRepo: 'keyvault-mock-attestation'
dockerFile: 'tools/keyvault-mock-attestation/Dockerfile'
stableTags:
- 'latest'
- name: stress_watcher
pool: 'azsdk-pool-mms-ubuntu-2004-general'
vmImage: 'MMSUbuntu20.04'
pool: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04
dockerRepo: 'stress/watcher'
dockerFile: 'tools/stress-cluster/services/Stress.Watcher/Dockerfile'
stableTags:
- 'latest'
- name: stress_deploy_test_resources
pool: 'azsdk-pool-mms-ubuntu-2004-general'
vmImage: 'MMSUbuntu20.04'
pool: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04
dockerRepo: 'stress/deploy-test-resources'
prepareScript: tools/stress-cluster/cluster/kubernetes/stress-test-addons/images/test-resource-deployer/prepare.ps1
dockerFile: 'tools/stress-cluster/cluster/kubernetes/stress-test-addons/images/test-resource-deployer/Dockerfile'
Expand Down
152 changes: 76 additions & 76 deletions eng/pipelines/apiview-review-gen-cadl.yml
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
pr: none
trigger: none
parameters:
- name: Reviews
type: string
default: '[{"ReviewID":"<reviewid>","RevisionID":"<revisionId>","SourceRepoName":"<RepoName>","FileName":"<fileName>","SourceBranchName":"<SourceBranchName>"}]'
- name: APIViewURL
type: string
default: 'https://apiview.dev'
pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
variables:
NodeVersion: '16.x'
jobs:
- job: CreateSwaggerReviewCodeFile
displayName: 'Create Swagger API review token file'
variables:
- template: /eng/pipelines/templates/variables/globals.yml
steps:
- task: NodeTool@0
inputs:
versionSpec: $(NodeVersion)
displayName: "Use Node $(NodeVersion)"
- pwsh: |
$reviews = "${{ parameters.Reviews }}"
Write-Host "Reviews: $($reviews)"
echo "##vso[task.setvariable variable=Reviews]$reviews"
displayName: "Setup Reviews Variable"
condition: eq(variables['Reviews'], '')
- pwsh: |
$url = "${{parameters.APIViewURL}}"
echo "##vso[task.setvariable variable=APIViewURL]$url"
displayName: "Setup APIViewURL Variable"
condition: eq(variables['APIViewURL'], '')
- pwsh: |
npm install -g @cadl-lang/compiler@0.37.0
npm install -g @azure-tools/cadl-apiview@0.3.0
npm list -g
displayName: "Install npm packages"
- task: Powershell@2
displayName: 'Generate APIView Token files'
inputs:
pwsh: true
filePath: $(Build.SourcesDirectory)/eng/scripts/Create-Apiview-Token-Cadl.ps1
arguments: >
-Reviews "$(Reviews)"
-OutputDir "$(Build.ArtifactStagingDirectory)"
-WorkingDir "$(Pipeline.Workspace)"
-GitPat "$(github-access-token)"
- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
artifactName: 'apiview'
- task: Powershell@2
displayName: 'Send Request to APIView to Update Token files'
condition: succeededOrFailed()
inputs:
pwsh: true
filePath: $(Build.SourcesDirectory)/eng/scripts/Apiview-Update-Generated-Review.ps1
arguments: >
-BuildId $(Build.BuildId)
-ApiviewUpdateUrl "$(APIViewURL)/review/UpdateApiReview"
pr: none

trigger: none

parameters:
- name: Reviews
type: string
default: '[{"ReviewID":"<reviewid>","RevisionID":"<revisionId>","SourceRepoName":"<RepoName>","FileName":"<fileName>","SourceBranchName":"<SourceBranchName>"}]'
- name: APIViewURL
type: string
default: 'https://apiview.dev'

pool:
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

variables:
NodeVersion: '16.x'

jobs:
- job: CreateSwaggerReviewCodeFile
displayName: 'Create Swagger API review token file'

variables:
- template: /eng/pipelines/templates/variables/globals.yml

steps:
- task: NodeTool@0
inputs:
versionSpec: $(NodeVersion)
displayName: "Use Node $(NodeVersion)"

- pwsh: |
$reviews = "${{ parameters.Reviews }}"
Write-Host "Reviews: $($reviews)"
echo "##vso[task.setvariable variable=Reviews]$reviews"
displayName: "Setup Reviews Variable"
condition: eq(variables['Reviews'], '')

- pwsh: |
$url = "${{parameters.APIViewURL}}"
echo "##vso[task.setvariable variable=APIViewURL]$url"
displayName: "Setup APIViewURL Variable"
condition: eq(variables['APIViewURL'], '')

- pwsh: |
npm install -g @cadl-lang/compiler@0.37.0
npm install -g @azure-tools/cadl-apiview@0.3.0
npm list -g
displayName: "Install npm packages"

- task: Powershell@2
displayName: 'Generate APIView Token files'
inputs:
pwsh: true
filePath: $(Build.SourcesDirectory)/eng/scripts/Create-Apiview-Token-Cadl.ps1
arguments: >
-Reviews "$(Reviews)"
-OutputDir "$(Build.ArtifactStagingDirectory)"
-WorkingDir "$(Pipeline.Workspace)"
-GitPat "$(github-access-token)"

- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
artifactName: 'apiview'

- task: Powershell@2
displayName: 'Send Request to APIView to Update Token files'
condition: succeededOrFailed()
inputs:
pwsh: true
filePath: $(Build.SourcesDirectory)/eng/scripts/Apiview-Update-Generated-Review.ps1
arguments: >
-BuildId $(Build.BuildId)
-ApiviewUpdateUrl "$(APIViewURL)/review/UpdateApiReview"
4 changes: 2 additions & 2 deletions eng/pipelines/apiview-review-gen-javascript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ pr: none
trigger: none

pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

parameters:
- name: Reviews
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/apiview-review-gen-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ pr: none
trigger: none

pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

parameters:
- name: Reviews
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/eng-common-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ pr:
- eng/common

pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

stages:
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/githubio-linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ trigger: none
pr: none

pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

variables:
cachefile: verify-links-cache.txt
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/live-test-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ stages:
- job: Run
timeoutInMinutes: 0
pool:
name: 'azsdk-pool-mms-ubuntu-2004-general'
vmImage: 'MMSUbuntu20.04'
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

steps:
- template: /eng/common/pipelines/templates/steps/cache-ps-modules.yml
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/merge-docs-main-to-live.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
- job:
displayName: 'ReleaseDocsMs: ${{repo.RepoName}}'
pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04
variables:
DocRepoLocation: $(Pipeline.Workspace)/docs
steps:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/mirror-pypi-to-dev-feed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
displayName: Mirror From PyPI

pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

variables:
- template: /eng/pipelines/templates/variables/globals.yml
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/mirror-repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ trigger: none
pr: none

pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

jobs:
- job: SyncRepos
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/notifications.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ stages:
PathPrefix: 'azure-dev'

pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

variables:
Organization: azure-sdk
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/pipeline-generation-single.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ variables:
jobs:
- job: GeneratePipeline
pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04
steps:
- checkout: none
- template: /eng/common/pipelines/templates/steps/install-pipeline-generation.yml
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/pipeline-generation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ parameters:
jobs:
- job: GeneratePipelines
pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04
timeoutInMinutes: 120
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/pipeline-owners-extraction.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ stages:
- job: Run
timeoutInMinutes: 120
pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

variables:
Organization: azure-sdk
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/publish-docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Additional sample inputs can be found in `eng/containers/ci.yml`, but here is an example.
# - name: test_proxy_linux
# pool: 'azsdk-pool-mms-ubuntu-2004-general'
# vmImage: 'MMSUbuntu20.04'
# pool: azsdk-pool-mms-ubuntu-2204-general
# vmImage: MMSUbuntu22.04
# dockerRepo: 'engsys/testproxy-lin'
# additionalDockerArgs: ''
# prepareScript: tools/test-proxy/docker/prepare.ps1
Expand Down Expand Up @@ -92,8 +92,8 @@ jobs:
- ${{ each config in parameters.DockerDeployments }}:
- container_build_${{ config.name }}
pool:
name: 'azsdk-pool-mms-ubuntu-2004-general'
vmImage: 'MMSUbuntu20.04'
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04

steps:
- task: Docker@2
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/stress-cluster-provision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
${{ else }}:
displayName: 'Provision'
pool:
name: 'azsdk-pool-mms-ubuntu-2004-general'
vmImage: 'MMSUbuntu20.04'
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04
steps:
- pwsh: |
$subscriptionConfiguration = @'
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/stress-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:
Repository: Azure/azure-sdk-for-cpp
Filters: '@{}'
pool:
name: 'azsdk-pool-mms-ubuntu-2004-general'
vmImage: 'MMSUbuntu20.04'
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: MMSUbuntu22.04
steps:
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
parameters:
Expand Down
Loading