From f6f9f022565c5c850d48d5cc6ac36029b77aaed0 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 14:54:58 -0700 Subject: [PATCH 01/13] Update to new agent pools --- eng/pipelines/templates/variables/image.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml index b1e56a2f9e..ca9f8def69 100644 --- a/eng/pipelines/templates/variables/image.yml +++ b/eng/pipelines/templates/variables/image.yml @@ -2,27 +2,15 @@ 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 + value: azsdk-pool - name: MACPOOL value: Azure Pipelines - 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 + value: windows-2022 - 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 From e98e1d5528e0e07664f84b410f5eb4d88fc2d73f Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 14:56:55 -0700 Subject: [PATCH 02/13] Update globals.yml --- eng/pipelines/templates/variables/globals.yml | 2 -- 1 file changed, 2 deletions(-) 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' From 21b5b50dff88506e70fd79171bda6ccef8b1c6e1 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 14:58:22 -0700 Subject: [PATCH 03/13] Update aggregate-reports.yml --- eng/pipelines/aggregate-reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 From a55cba30ded6725936523523bd342d5672788565 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 14:59:39 -0700 Subject: [PATCH 04/13] Update archetype-sdk-client.yml --- .../templates/jobs/archetype-sdk-client.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 5dbc7a21c1..930f05da3a 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -7,10 +7,11 @@ jobs: variables: - template: /eng/pipelines/templates/variables/globals.yml + - template: /eng/pipelines/templates/variables/image.yml pool: - name: $(Pool) - image: $(OSVmImage) + name: $(LINUXPOOL) + image: $(LINUXIMAGE) os: linux steps: @@ -38,8 +39,8 @@ jobs: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: $(Pool) - image: $(OSVmImage) + name: $(LINUXPOOL) + image: $(LINUXIMAGE) os: linux steps: @@ -92,8 +93,8 @@ jobs: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: $(Pool) - image: $(OSVmImage) + name: $(LINUXPOOL) + image: $(LINUXIMAGE) os: linux steps: From e0fc4c91d17c12daec8b96077216f1cd08d97a49 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 15:02:53 -0700 Subject: [PATCH 05/13] Update archetype-android-release.yml --- .../stages/archetype-android-release.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-android-release.yml b/eng/pipelines/templates/stages/archetype-android-release.yml index 443e1c44f7..622519dabc 100644 --- a/eng/pipelines/templates/stages/archetype-android-release.yml +++ b/eng/pipelines/templates/stages/archetype-android-release.yml @@ -22,8 +22,8 @@ stages: - job: SignPackage timeoutInMinutes: 20 pool: - name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + name: $(WINDOWSPOOL) + image: $(WINDOWSIMAGE) os: windows steps: - checkout: azure-sdk-build-tools @@ -107,8 +107,8 @@ stages: - VerifyReleaseVersion pool: - name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + name: $(WINDOWSPOOL) + image: $(WINDOWSIMAGE) os: windows steps: - checkout: self @@ -137,9 +137,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 +154,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: $(WINDOWSIMAGE) os: windows steps: From 56eb38e4c8b918cec36dc2c57accad11f40e58de Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 15:03:33 -0700 Subject: [PATCH 06/13] Update image.yml --- eng/pipelines/templates/variables/image.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml index ca9f8def69..1621d86e2b 100644 --- a/eng/pipelines/templates/variables/image.yml +++ b/eng/pipelines/templates/variables/image.yml @@ -5,12 +5,8 @@ variables: value: azsdk-pool - name: WINDOWSPOOL value: azsdk-pool - - name: MACPOOL - value: Azure Pipelines - name: LINUXVMIMAGE value: ubuntu-24.04 - name: WINDOWSVMIMAGE value: windows-2022 - - name: MACVMIMAGE - value: macos-latest From 1b096abd2f816ec377929021a20e2abf6cc627d1 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 15:07:23 -0700 Subject: [PATCH 07/13] Update archetype-sdk-client.yml --- eng/pipelines/templates/stages/archetype-sdk-client.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 82eda92724..428814656d 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -6,6 +6,9 @@ parameters: type: string default: not-specified +variables: + - template: /eng/pipelines/templates/variables/globals.yml + - template: /eng/pipelines/templates/variables/image.yml extends: template: /eng/pipelines/templates/stages/1es-redirect.yml @@ -25,4 +28,4 @@ extends: DependsOn: Build Artifacts: ${{parameters.Artifacts}} ArtifactName: packages - VerifyVersions: 'false' \ No newline at end of file + VerifyVersions: 'false' From 2885a2fe777cc3b550bebf74b9ec95e164f48a12 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 15:08:27 -0700 Subject: [PATCH 08/13] Update archetype-sdk-client.yml --- eng/pipelines/templates/stages/archetype-sdk-client.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 428814656d..909f99ac63 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -6,15 +6,15 @@ parameters: type: string default: not-specified -variables: - - template: /eng/pipelines/templates/variables/globals.yml - - template: /eng/pipelines/templates/variables/image.yml - 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: From 965d11d551437c3132116b902096ae3b289dac4f Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 15:11:33 -0700 Subject: [PATCH 09/13] Update archetype-sdk-client.yml --- .../templates/jobs/archetype-sdk-client.yml | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 930f05da3a..55bb3bdb0e 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -4,14 +4,9 @@ parameters: jobs: - job: 'Build' - - variables: - - template: /eng/pipelines/templates/variables/globals.yml - - template: /eng/pipelines/templates/variables/image.yml - pool: name: $(LINUXPOOL) - image: $(LINUXIMAGE) + image: $(LINUXVMIMAGE) os: linux steps: @@ -34,13 +29,9 @@ jobs: ArtifactName: 'packages' - job: 'Analyze' - - variables: - - template: /eng/pipelines/templates/variables/globals.yml - pool: name: $(LINUXPOOL) - image: $(LINUXIMAGE) + image: $(LINUXVMIMAGE) os: linux steps: @@ -88,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: $(LINUXPOOL) - image: $(LINUXIMAGE) + image: $(LINUXVMIMAGE) os: linux steps: - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml parameters: - AgentImage: $(OSVmImage) + AgentImage: $(LINUXVMIMAGE) - task: Gradle@3 inputs: From 1fb15a5c43296e205a13b03bd2862ce90063928f Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 15:13:44 -0700 Subject: [PATCH 10/13] Update archetype-android-release.yml --- .../templates/stages/archetype-android-release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-android-release.yml b/eng/pipelines/templates/stages/archetype-android-release.yml index 622519dabc..68eba41af7 100644 --- a/eng/pipelines/templates/stages/archetype-android-release.yml +++ b/eng/pipelines/templates/stages/archetype-android-release.yml @@ -17,13 +17,13 @@ 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 - dependsOn: ${{parameters.DependsOn}} + dependsOn: ${{parameters.DependsOn}} jobs: - job: SignPackage timeoutInMinutes: 20 pool: name: $(WINDOWSPOOL) - image: $(WINDOWSIMAGE) + image: $(WINDOWSVMIMAGE) os: windows steps: - checkout: azure-sdk-build-tools @@ -108,7 +108,7 @@ stages: pool: name: $(WINDOWSPOOL) - image: $(WINDOWSIMAGE) + image: $(WINDOWSVMIMAGE) os: windows steps: - checkout: self @@ -157,7 +157,7 @@ stages: pool: name: $(WINDOWSPOOL) - image: $(WINDOWSIMAGE) + image: $(WINDOWSVMIMAGE) os: windows steps: From c1d48d4e591289fc0417145c3be68c721c7979dd Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 15:14:26 -0700 Subject: [PATCH 11/13] Update archetype-sdk-client.yml --- eng/pipelines/templates/stages/archetype-sdk-client.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 909f99ac63..1bc417b4c0 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -10,11 +10,11 @@ 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 + variables: + - template: /eng/pipelines/templates/variables/globals.yml + - template: /eng/pipelines/templates/variables/image.yml + - stage: Build jobs: - template: ../jobs/archetype-sdk-client.yml parameters: From 0842babf6db29e902c8bfd201ec93e9d2eef6fb7 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 15:17:53 -0700 Subject: [PATCH 12/13] Update archetype-sdk-client.yml --- eng/pipelines/templates/stages/archetype-sdk-client.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 1bc417b4c0..f7ee799d2f 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -10,11 +10,10 @@ extends: template: /eng/pipelines/templates/stages/1es-redirect.yml parameters: stages: - variables: - - template: /eng/pipelines/templates/variables/globals.yml - - template: /eng/pipelines/templates/variables/image.yml - - 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: From fd1c763ab2ae7ee802481afffd3b597a81fdaed1 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 23 Jun 2025 15:18:49 -0700 Subject: [PATCH 13/13] Update archetype-android-release.yml --- .../templates/stages/archetype-android-release.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/archetype-android-release.yml b/eng/pipelines/templates/stages/archetype-android-release.yml index 68eba41af7..2678b44e03 100644 --- a/eng/pipelines/templates/stages/archetype-android-release.yml +++ b/eng/pipelines/templates/stages/archetype-android-release.yml @@ -17,7 +17,10 @@ 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 - dependsOn: ${{parameters.DependsOn}} + variables: + - template: /eng/pipelines/templates/variables/globals.yml + - template: /eng/pipelines/templates/variables/image.yml + dependsOn: ${{parameters.DependsOn}} jobs: - job: SignPackage timeoutInMinutes: 20 @@ -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'))