diff --git a/.azure-pipelines/sync-alias.yml b/.azure-pipelines/sync-alias.yml index 813397e00d7..19e6a60a95a 100644 --- a/.azure-pipelines/sync-alias.yml +++ b/.azure-pipelines/sync-alias.yml @@ -14,10 +14,14 @@ resources: type: git name: internal.wiki +variables: +- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/variables.yml + jobs: - job: UpdateYaml displayName: Update resourceManagement.yml - pool: pool-windows-2019 + pool: + name: ${{ variables.windows_pool }} uses: repositories: - ServiceContactList diff --git a/.azure-pipelines/templates/variables.yml b/.azure-pipelines/templates/variables.yml index e0b18de3596..a05275ee166 100644 --- a/.azure-pipelines/templates/variables.yml +++ b/.azure-pipelines/templates/variables.yml @@ -1,5 +1,5 @@ variables: - ubuntu_pool: 'pool-ubuntu-2004' + ubuntu_pool: 'pool-ubuntu-2204' windows_pool: 'pool-windows-2019' - ubuntu_arm64_pool: 'ubuntu-arm64-2004-pool' + ubuntu_arm64_pool: 'pool-ubuntu-latest-arm64' macos_pool: 'macOS-14' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1e264fe733a..9a64628afa2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,10 +25,10 @@ parameters: default: - name: AMD64 value: amd64 - pool: pool-ubuntu-2004 + pool: pool-ubuntu-latest-multi-core - name: ARM64 value: arm64 - pool: ubuntu-arm64-2004-pool + pool: pool-ubuntu-latest-arm64 jobs: - job: CheckPullRequest diff --git a/scripts/live_test/CLITest.yml b/scripts/live_test/CLITest.yml index 77beb55c740..8bd19444b56 100644 --- a/scripts/live_test/CLITest.yml +++ b/scripts/live_test/CLITest.yml @@ -25,7 +25,7 @@ variables: stages: # Azure DevOps limits the number of jobs to 256, so it must be split according to the platform and placed in different stages. - stage: TestUbuntu - displayName: Live Test on Ubuntu 2004 + displayName: Live Test on Ubuntu latest condition: succeededOrFailed() jobs: - job: LiveTest @@ -455,7 +455,7 @@ stages: if [[ "$(USER_TARGET)" =~ "$(Target)" || ("$(USER_TARGET)" == "main" && ! "$(Target)" =~ ^ext-.*) || ("$(USER_TARGET)" == "extensions" && "$(Target)" =~ ^ext-.*) || ("$(USER_TARGET)" == "ALL" || "$(USER_TARGET)" == "all" || "$(USER_TARGET)" == "") ]]; then echo "Match!" echo "##vso[task.setvariable variable=Match]1" - echo "##vso[task.setvariable variable=platform]ubuntu2004" + echo "##vso[task.setvariable variable=platform]ubuntulatest" else echo "Not match!" echo "##vso[task.setvariable variable=Match]0"