diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml index 6d8af21ec3..9c4be192ae 100644 --- a/eng/pipelines/aggregate-reports.yml +++ b/eng/pipelines/aggregate-reports.yml @@ -10,6 +10,7 @@ pr: variables: - template: /eng/pipelines/templates/variables/globals.yml + - template: /eng/pipelines/templates/variables/image.yml stages: - stage: AggregateReports @@ -22,8 +23,8 @@ stages: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: $(Pool) - vmImage: $(OSVmImage) + name: $(LINUXPOOL) + demands: ImageOverride -equals $(LINUXIMAGE) steps: - task: Gradle@3 diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 5dbc7a21c1..55bb3bdb0e 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -4,13 +4,9 @@ parameters: jobs: - job: 'Build' - - variables: - - template: /eng/pipelines/templates/variables/globals.yml - pool: - name: $(Pool) - image: $(OSVmImage) + name: $(LINUXPOOL) + image: $(LINUXVMIMAGE) os: linux steps: @@ -33,13 +29,9 @@ jobs: ArtifactName: 'packages' - job: 'Analyze' - - variables: - - template: /eng/pipelines/templates/variables/globals.yml - pool: - name: $(Pool) - image: $(OSVmImage) + name: $(LINUXPOOL) + image: $(LINUXVMIMAGE) os: linux steps: @@ -87,19 +79,15 @@ jobs: - template: /eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml - job: 'UnitTest' - - variables: - - template: /eng/pipelines/templates/variables/globals.yml - pool: - name: $(Pool) - image: $(OSVmImage) + name: $(LINUXPOOL) + image: $(LINUXVMIMAGE) os: linux steps: - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml parameters: - AgentImage: $(OSVmImage) + AgentImage: $(LINUXVMIMAGE) - task: Gradle@3 inputs: diff --git a/eng/pipelines/templates/stages/archetype-android-release.yml b/eng/pipelines/templates/stages/archetype-android-release.yml index 443e1c44f7..2678b44e03 100644 --- a/eng/pipelines/templates/stages/archetype-android-release.yml +++ b/eng/pipelines/templates/stages/archetype-android-release.yml @@ -17,13 +17,16 @@ stages: # in this case we do GPG signing in order to publish to Maven Central. At the moment signing # is protected by an approval check but this may be removed in the future. - stage: Signing + variables: + - template: /eng/pipelines/templates/variables/globals.yml + - template: /eng/pipelines/templates/variables/image.yml dependsOn: ${{parameters.DependsOn}} jobs: - job: SignPackage timeoutInMinutes: 20 pool: - name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + name: $(WINDOWSPOOL) + image: $(WINDOWSVMIMAGE) os: windows steps: - checkout: azure-sdk-build-tools @@ -94,6 +97,9 @@ stages: - ${{if and(eq(variables['Build.Reason'], 'Manual'), eq(variables['System.TeamProject'], 'internal'))}}: - ${{ each artifact in parameters.Artifacts }}: - stage: Release_${{artifact.safeName}} + variables: + - template: /eng/pipelines/templates/variables/globals.yml + - template: /eng/pipelines/templates/variables/image.yml displayName: 'Release: ${{artifact.name}}' dependsOn: Signing condition: and(succeeded(), ne(variables['SetDevVersion'], 'true'), ne(variables['Skip.Release'], 'true'), ne(variables['Build.Repository.Name'], 'Azure/azure-sdk-for-android-pr')) @@ -107,8 +113,8 @@ stages: - VerifyReleaseVersion pool: - name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + name: $(WINDOWSPOOL) + image: $(WINDOWSVMIMAGE) os: windows steps: - checkout: self @@ -137,9 +143,10 @@ stages: targetPath: '$(Pipeline.Workspace)/${{parameters.ArtifactName}}-${{artifact.name}}-esrp-flattened' pool: - name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + name: azsdk-pool + image: windows-2022 os: windows + strategy: runOnce: deploy: @@ -153,10 +160,10 @@ stages: displayName: Publish Docs to GitHubIO Blob Storage condition: and(succeeded(), ne(variables['Skip.PublishDocs'], 'true')) dependsOn: PublishESRPPackage - + pool: - name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + name: $(WINDOWSPOOL) + image: $(WINDOWSVMIMAGE) os: windows steps: diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 82eda92724..f7ee799d2f 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -6,12 +6,14 @@ parameters: type: string default: not-specified - extends: template: /eng/pipelines/templates/stages/1es-redirect.yml parameters: stages: - stage: Build + variables: + - template: /eng/pipelines/templates/variables/globals.yml + - template: /eng/pipelines/templates/variables/image.yml jobs: - template: ../jobs/archetype-sdk-client.yml parameters: @@ -25,4 +27,4 @@ extends: DependsOn: Build Artifacts: ${{parameters.Artifacts}} ArtifactName: packages - VerifyVersions: 'false' \ No newline at end of file + VerifyVersions: 'false' diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml index f09def0e96..b61cecfc31 100644 --- a/eng/pipelines/templates/variables/globals.yml +++ b/eng/pipelines/templates/variables/globals.yml @@ -1,6 +1,4 @@ variables: - Pool: azsdk-pool-mms-ubuntu-2004-general - OSVmImage: azsdk-pool-mms-ubuntu-2004-1espt DocWardenVersion: '0.4.2' JavaBuildVersion: '1.11' JavaTestVersion: '1.11' diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml index b1e56a2f9e..1621d86e2b 100644 --- a/eng/pipelines/templates/variables/image.yml +++ b/eng/pipelines/templates/variables/image.yml @@ -2,27 +2,11 @@ variables: - name: LINUXPOOL - value: azsdk-pool-mms-ubuntu-2004-general - - name: LINUXNEXTPOOL - value: azsdk-pool-mms-ubuntu-2204-general + value: azsdk-pool - name: WINDOWSPOOL - value: azsdk-pool-mms-win-2022-general - - name: MACPOOL - value: Azure Pipelines + value: azsdk-pool - name: LINUXVMIMAGE - value: azsdk-pool-mms-ubuntu-2004-1espt - - name: LINUXNEXTVMIMAGE - value: azsdk-pool-mms-ubuntu-2204-1espt + value: ubuntu-24.04 - name: WINDOWSVMIMAGE - value: azsdk-pool-mms-win-2022-1espt - - name: MACVMIMAGE - value: macos-latest - - # Values required for pool.os field in 1es pipeline templates - - name: LINUXOS - value: linux - - name: WINDOWSOS - value: windows - - name: MACOS - value: macOS + value: windows-2022