Merge branch 'Azure:dev' into dev

Author: yewmsft

.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
@@ -71,14 +75,14 @@ jobs:
       git add .github/policies
       git commit -m "Sync resourceManagement.yml"
 
-      git remote set-url origin https://azclibot:$(GithubToken)@github.com/Azure/azure-cli.git;
-      git push origin "sync_alias_$env:Build_BuildId" --force
+      git remote add azclibot https://azclibot:$(GithubToken)@github.com/azclibot/azure-cli.git
+      git push azclibot "sync_alias_$env:Build_BuildId" --force
     displayName: Git commit and push
     condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))
 
   - pwsh: |
       $Title = "{CI} Sync resourceManagement.yml according To ADO Wiki Page - Service Contact List"
-      $HeadBranch = "sync_alias_$env:Build_BuildId"
+      $HeadBranch = "azclibot:sync_alias_$env:Build_BuildId"
       $BaseBranch = "dev"
       $Description = "This PR synchronizes the task: 'Triage issues to the service team' part of resourceManagement.yml from table of Service Contact List in ADO wiki page"
       
@@ -88,5 +92,5 @@ jobs:
 
       Invoke-WebRequest -Uri $Uri -Method POST -Headers $Headers -Body ($RequestBody | ConvertTo-Json)
 
-    displayName: Create PR to dev branch
+    displayName: Create PR to azure/azure-cli dev branch
     condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))

.azure-pipelines/templates/variables.yml

@@ -1,6 +1,6 @@
 variables:
-  ubuntu_pool: 'pool-ubuntu-2004'
-  ubuntu_multi_core_pool: 'pool-ubuntu-2004-multi-core'
+  ubuntu_pool: 'pool-ubuntu-2204'
+  ubuntu_multi_core_pool: 'pool-ubuntu-latest-multi-core'
   windows_pool: 'pool-windows-2019'
   ubuntu_arm64_pool: 'ubuntu-arm64-2004-pool'
   macos_pool: 'macOS-14'

.github/workflows/TriggerReferenceDocsCI.yml

@@ -25,56 +25,24 @@ jobs:
       env: 
         AdoOrg: ${{secrets.ADO_DocsReference_Organization}}
         AdoProject: ${{secrets.ADO_DocsReference_Project}}
-        AdoPipelineId: ${{secrets.ADO_DocsReference_JumpPipeline_ID}}
-        CheckInterval: 60
+        AdoLatestPipelineId: ${{secrets.ADO_DocsReference_Latest_Pipeline_ID}}
+        AdoLtsPipelineId: ${{secrets.ADO_DocsReference_LTS_Pipeline_ID}}
+        ReleaseBranch: ${{ github.event.release.target_commitish }}
       run: |
           $organization = $env:AdoOrg
           $project = $env:AdoProject
-          $definitionId = $env:AdoPipelineId
-          $checkInterval = $env:CheckInterval
+          $thisRepoLink = "${{ github.server_url }}/${{ github.repository }}"
           $thisRunLink = "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          $triggerBranch = 'main'
-          $variables = @('commitAuthor=azcli', 'triggerFromRepo=https://github.com/Azure/azure-cli', "triggerBranch=$triggerBranch", "triggerByPipeline=$thisRunLink")
+          $triggerBranch = $env:ReleaseBranch
+          $definitionId = $triggerBranch -eq 'release' ? $env:AdoLatestPipelineId : $env:AdoLtsPipelineId
+          $variables = @("triggerBranch=$triggerBranch", "triggerFromRepo=$thisRepoLink", "triggerByPipeline=$thisRunLink")
 
           $output = az pipelines build queue --definition-id $definitionId --project $project --organization $organization --variables @variables | ConvertFrom-Json -AsHashtable
           if ($? -eq $false)
           {
               $pipelineDefinitionLink = $organization + [uri]::EscapeDataString($project) + "/_build?definitionId=$definitionId"
               Write-Error "Failed to queue the pipeline run for $pipelineDefinitionLink, please check above error message."
           }
-          $runIdInJumpPipeline = $output.id
-          Write-Host "runIdInJumpPipeline: $runIdInJumpPipeline"
-          do
-          {
-              Start-Sleep -Seconds $checkInterval
-              $status = az pipelines runs show --query status --id $runIdInJumpPipeline --project $project --organization $organization --output tsv
-              $currentTime = (Get-Date -AsUTC).ToString('yyyy-MM-dd HH:mm:ss')
-              Write-Host "[UTC $currentTime] apidrop shared jump pipeline run status: $status"
-          } while ($status -ne 'completed')
-          $jumpOutput = az pipelines runs show --id $runIdInJumpPipeline --project $project --organization $organization | ConvertFrom-Json -AsHashtable
-
-          $targetPipelineResult = ($jumpOutput.tags -Match 'jump_return_result_(canceled|failed|partiallySucceeded|succeeded)')[0] -replace 'jump_return_result_', ''
-          $runId = ($jumpOutput.tags -Match 'jump_return_id_\d+')[0] -replace 'jump_return_id_', ''
-          $triggeredTargetPipeline = $runId ? $true : $false
-          if ($triggeredTargetPipeline)
-          {
-              # apidrop shared jump pipeline triggered target pipeline
-              $printMessage = 'Triggered reference pipeline run'
-              $printMessage += $targetPipelineResult ? " with its result $targetPipelineResult" : '' # waited for completion or not
-          }
-          else
-          {
-              # apidrop shared jump pipeline may fail to trigger target pipeline
-              $runId = $runIdInJumpPipeline
-              $printMessage = "Jump pipeline run with $($jumpOutput.result) state may fail to trigger reference pipeline"
-          }
+          $runId = $output.id
           $runLink = $organization + [uri]::EscapeDataString($project) + "/_build/results?buildId=$runId"
-          $printMessage += ", for details please check: $runLink"
-          if ($triggeredTargetPipeline)
-          {
-              Write-Host $printMessage
-          }
-          else
-          {
-              Write-Error $printMessage
-          }
+          Write-Host "Triggered reference pipeline run, for details please check: $runLink"

azure-pipelines.yml

@@ -27,7 +27,7 @@ parameters:
   default:
   - name: AMD64
     value: amd64
-    pool: pool-ubuntu-2004-multi-core
+    pool: pool-ubuntu-latest-multi-core
   - name: ARM64
     value: arm64
     pool: ubuntu-arm64-2004-pool

doc/how_to_bump_SDK_version_in_cli.md

@@ -2,6 +2,10 @@
 
 This article aims to provide a guide for CLI developers and contributors to bump SDK version in Azure CLI.
 
+## Prerequisites
+
+We assume the [swagger](https://github.com/Azure/azure-rest-api-specs) has been updated and the related Python SDK has been generated.
+
 ## Overview
 
 Developers need to do several things for bumping version:
@@ -52,6 +56,7 @@ For scenario b, variables `PACKAGE`, `TARGET_PACKAGE_VERSION`, `RESOURCE_TYPE` a
 - TARGET_PACKAGE_VERSION: The SDK new version, e.g., `19.3.0`. **Required for scenario b**. Leave it as empty for scenario a.
 - RESOURCE_TYPE: The resource type enum name define in [CLI Core](https://github.com/Azure/azure-cli/blob/ce74ae358b51aedfdfb6c32042b515d949618e33/src/azure-cli-core/azure/cli/core/profiles/_shared.py#L38), e.g., `MGMT_NETWORK`. Required if you want to update the API version definition in CLI Core. Usually used for multi-API SDKs. Leave it as empty for scenario a.
 - TARGET_API_VERSION: The new API version(s):
+    - Leave this variable as empty if the SDK contains single target API version, else
     - If the AZURE_API_PROFILES['latest'][RESOURCE_TYPE] definition is `str` type, then just fulfill this variable with new API version. For example, to update API version for [ResourceType.MGMT_NETWORK](https://github.com/Azure/azure-cli/blob/ce74ae358b51aedfdfb6c32042b515d949618e33/src/azure-cli-core/azure/cli/core/profiles/_shared.py#L150), use `2021-10-01` as variable value.
     - If the  AZURE_API_PROFILES['latest'][RESOURCE_TYPE] definition is `SDKProfile` type, then fulfill this variable with 'operation=version' pairs separated by space. For example, to update API version for [ResourceType.MGMT_COMPUTE](https://github.com/Azure/azure-cli/blob/ce74ae358b51aedfdfb6c32042b515d949618e33/src/azure-cli-core/azure/cli/core/profiles/_shared.py#L151-L164), use `default=2022-05-01 snapshots=2022-03-01 gallery_images=2021-12-01` as variable value. `default` means other operations except for explicitly listed ones.