diff --git a/eng/common/pipelines/codeowners-linter.yml b/eng/common/pipelines/codeowners-linter.yml index 821b0ea8b..4fe03ab3f 100644 --- a/eng/common/pipelines/codeowners-linter.yml +++ b/eng/common/pipelines/codeowners-linter.yml @@ -27,8 +27,8 @@ stages: - job: Run timeoutInMinutes: 120 pool: - name: azsdk-pool-mms-ubuntu-2204-general - vmImage: ubuntu-22.04 + name: azsdk-pool + demands: ImageOverride -equals ubuntu-24.04 variables: CodeownersLinterVersion: '1.0.0-dev.20240926.2' diff --git a/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml b/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml index afc5de87c..00aaec7c6 100644 --- a/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml +++ b/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml @@ -27,10 +27,10 @@ parameters: default: [] - name: Pool type: string - default: azsdk-pool-mms-ubuntu-2204-general + default: azsdk-pool - name: OsVmImage type: string - default: ubuntu-22.04 + default: ubuntu-24.04 # This parameter is only necessary if there are multiple invocations of this template within the SAME STAGE. # When that occurs, provide a name other than the default value. - name: GenerateJobName diff --git a/eng/common/pipelines/templates/jobs/docindex.yml b/eng/common/pipelines/templates/jobs/docindex.yml index 45c19dc21..077d07ad1 100644 --- a/eng/common/pipelines/templates/jobs/docindex.yml +++ b/eng/common/pipelines/templates/jobs/docindex.yml @@ -1,7 +1,8 @@ jobs: - job: CreateDocIndex pool: - name: azsdk-pool-mms-win-2022-general + name: azsdk-pool + demands: ImageOverride -equals windows-2022 steps: - task: UsePythonVersion@0 displayName: 'Use Python 3.11' @@ -36,14 +37,14 @@ jobs: Copy-Item -Path $(Build.SourcesDirectory)/eng/* -Destination ./ -Recurse -Force echo "##vso[task.setvariable variable=toolPath]$(Build.BinariesDirectory)" workingDirectory: $(Build.BinariesDirectory) - displayName: Move eng/common to Tool Directory + displayName: Move eng/common to Tool Directory - task: PublishPipelineArtifact@0 condition: succeeded() inputs: artifactName: "Doc.Index" targetPath: $(Build.ArtifactStagingDirectory)/docfx_project/_site - + - pwsh: | git checkout -b gh-pages-local --track origin/gh-pages-root -f workingDirectory: $(Build.SourcesDirectory) diff --git a/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml b/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml index 357b6d336..cbe9ef433 100644 --- a/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml +++ b/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml @@ -25,18 +25,18 @@ stages: strategy: matrix: Windows: - Pool: azsdk-pool-mms-win-2022-general + Pool: azsdk-pool Image: windows-2022 Linux: - Pool: azsdk-pool-mms-ubuntu-2204-general - Image: ubuntu-22.04 + Pool: azsdk-pool + Image: ubuntu-24.04 Mac: Pool: Azure Pipelines Image: macos-latest pool: name: $(Pool) - vmImage: $(Image) + demands: ImageOverride -equals $(Image) steps: - ${{ parameters.PreTestSteps }}