Skip to content

Commit 3e34d67

Browse files
Merge branch 'dev' of github.com:SourabhSomnathGholap/azure-cli into users/sgholap/TVMWithStdPolicy
2 parents f47432c + 6d07c11 commit 3e34d67

File tree

182 files changed

+64186
-164823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+64186
-164823
lines changed

.azure-pipelines/sync-alias.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ resources:
1414
type: git
1515
name: internal.wiki
1616

17+
variables:
18+
- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/variables.yml
19+
1720
jobs:
1821
- job: UpdateYaml
1922
displayName: Update resourceManagement.yml
20-
pool: pool-windows-2019
23+
pool:
24+
name: ${{ variables.windows_pool }}
2125
uses:
2226
repositories:
2327
- ServiceContactList
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
2-
ubuntu_pool: 'pool-ubuntu-2004'
3-
ubuntu_multi_core_pool: 'pool-ubuntu-2004-multi-core'
2+
ubuntu_pool: 'pool-ubuntu-2204'
3+
ubuntu_multi_core_pool: 'pool-ubuntu-latest-multi-core'
44
windows_pool: 'pool-windows-2019'
5-
ubuntu_arm64_pool: 'ubuntu-arm64-2004-pool'
5+
ubuntu_arm64_pool: 'pool-ubuntu-latest-arm64'
66
macos_pool: 'macOS-14'

.github/CODEOWNERS

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
/linter_exclusions.yml @jsntcy @kairu-ms @zhoxing-ms
88

99
/doc/ @jiasli @kairu-ms @jsntcy
10-
/tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy
10+
/tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
1111
/scripts/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
1212
/scripts/live_test @kairu-ms @wangzelin007
13-
/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @wangzelin007
13+
/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @wangzelin007 @bebound
1414

1515
/src/azure-cli-core/ @jiasli @evelyn-ys @jsntcy @kairu-ms @zhoxing-ms @calvinhzy @necusjz @bebound
16-
/src/azure-cli-core/azure/cli/core/_profile.py @jiasli @evelyn-ys @calvinhzy @bebound
17-
/src/azure-cli-core/azure/cli/core/auth/ @jiasli @evelyn-ys @calvinhzy @bebound
16+
/src/azure-cli-core/azure/cli/core/_profile.py @jiasli @evelyn-ys @bebound
17+
/src/azure-cli-core/azure/cli/core/auth/ @jiasli @evelyn-ys @bebound
1818
/src/azure-cli-core/azure/cli/core/extension/ @jsntcy @kairu-ms
1919
/src/azure-cli-core/azure/cli/core/style.py @jiasli @evelyn-ys @zhoxing-ms
2020
/src/azure-cli-core/azure/cli/core/aaz/ @kairu-ms @necusjz @calvinhzy @jsntcy
@@ -52,10 +52,10 @@
5252
/src/azure-cli/azure/cli/command_modules/network/ @jsntcy @kairu-ms @wangzelin007 @necusjz
5353
/src/azure-cli/azure/cli/command_modules/policyinsights/ @cheggert
5454
/src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @kairu-ms @necusjz
55-
/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys @calvinhzy @bebound
55+
/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys @bebound
5656
/src/azure-cli/azure/cli/command_modules/rdbms/ @arde0708 @evelyn-ys @calvinhzy @alanenriqueo
5757
/src/azure-cli/azure/cli/command_modules/resource/ @zhoxing-ms @jsntcy @yanzhudd
58-
/src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys @calvinhzy @bebound
58+
/src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys @bebound
5959
/src/azure-cli/azure/cli/command_modules/search/ @huangbolun @kairu-ms
6060
/src/azure-cli/azure/cli/command_modules/servicebus/ @v-ajnava @zhoxing-ms @jsntcy @evelyn-ys
6161
/src/azure-cli/azure/cli/command_modules/serviceconnector/ @yungezz @houk-ms @xfz11 @yanzhudd @kairu-ms
@@ -65,4 +65,4 @@
6565
/src/azure-cli/azure/cli/command_modules/synapse/ @jsntcy @idear1203 @zesluo @evelyn-ys
6666
/src/azure-cli/azure/cli/command_modules/util/ @jiasli @zhoxing-ms @evelyn-ys
6767
/src/azure-cli/azure/cli/command_modules/vm/ @zhoxing-ms @jsntcy @wangzelin007 @yanzhudd @Drewm3 @TravisCragg-MSFT @nikhilpatel909 @sandeepraichura @hilaryw29 @GabstaMSFT @ramankumarlive @ushnaarshadkhan
68-
/src/azure-cli/azure/cli/command_modules/containerapp/ @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre
68+
/src/azure-cli/azure/cli/command_modules/containerapp/ @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre @zhoxing-ms @yanzhudd @ShichaoQiu

.github/policies/resourceManagement.yml

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,18 @@ configuration:
692692
- bberera
693693
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
694694
assignMentionees: False
695+
- if:
696+
- hasLabel:
697+
label: Service Attention
698+
- hasLabel:
699+
label: CodeSigning
700+
then:
701+
- mentionUsers:
702+
mentionees:
703+
- Jaxelr
704+
- DawnWang17
705+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
706+
assignMentionees: False
695707
- if:
696708
- hasLabel:
697709
label: Service Attention
@@ -1419,8 +1431,8 @@ configuration:
14191431
then:
14201432
- mentionUsers:
14211433
mentionees:
1422-
- raedJarrar
1423-
- jifems
1434+
- dlacy7
1435+
- NateB2
14241436
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
14251437
assignMentionees: False
14261438
- if:
@@ -1576,7 +1588,9 @@ configuration:
15761588
then:
15771589
- mentionUsers:
15781590
mentionees:
1579-
- jfggdl
1591+
- Kishp01
1592+
- veyaddan
1593+
- santoshallumicrosoft
15801594
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
15811595
assignMentionees: False
15821596
- if:
@@ -1624,6 +1638,7 @@ configuration:
16241638
mentionees:
16251639
- dkershaw10
16261640
- baywet
1641+
- SteveMutungi254
16271642
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
16281643
assignMentionees: False
16291644
- if:
@@ -2125,7 +2140,6 @@ configuration:
21252140
then:
21262141
- mentionUsers:
21272142
mentionees:
2128-
- SameergMS
21292143
- yairgil
21302144
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
21312145
assignMentionees: False
@@ -3094,6 +3108,7 @@ configuration:
30943108
mentionees:
30953109
- AzureAppServiceCLI
30963110
- antcp
3111+
- yutanglin16
30973112
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
30983113
assignMentionees: False
30993114
- if:
@@ -3108,6 +3123,19 @@ configuration:
31083123
- vicancy
31093124
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
31103125
assignMentionees: False
3126+
- if:
3127+
- hasLabel:
3128+
label: Service Attention
3129+
- hasLabel:
3130+
label: Workloads
3131+
then:
3132+
- mentionUsers:
3133+
mentionees:
3134+
- jaskisin
3135+
- ajaygit158
3136+
- praveennet
3137+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
3138+
assignMentionees: False
31113139
description: Triage issues to the service team
31123140
- if:
31133141
- payloadType: Pull_Request
@@ -6370,5 +6398,25 @@ configuration:
63706398
users:
63716399
- ReaNAiveD
63726400
description: '[SecurityInsights] Auto assign labels and reviewers based on PR title/description.'
6401+
- if:
6402+
- payloadType: Issues
6403+
- or:
6404+
- titleContains:
6405+
pattern: '[Aa]z [Qq]uantum'
6406+
isRegex: True
6407+
- bodyContains:
6408+
pattern: '[Aa]z [Qq]uantum'
6409+
isRegex: True
6410+
- or:
6411+
- isAction:
6412+
action: Opened
6413+
then:
6414+
- addLabel:
6415+
label: Auto-Assign
6416+
- addLabel:
6417+
label: Quantum
6418+
- addLabel:
6419+
label: Service Attention
6420+
description: '[Quantum] auto assign labels and users based on issue description.'
63736421
onFailure:
63746422
onSuccess:

.github/workflows/AddIssueComment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44

55
jobs:
66
thank-user:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-latest
88
permissions:
99
issues: write
1010
name: Say thanks for the Issue

.github/workflows/AddIssueCommentWithLabel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
comment-non-security:
88
if: contains(github.event.issue.labels.*.name, 'non-security')
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-latest
1010
permissions:
1111
issues: write
1212
name: Comment on issue

.github/workflows/TriggerReferenceDocsCI.yml

Lines changed: 9 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -25,56 +25,24 @@ jobs:
2525
env:
2626
AdoOrg: ${{secrets.ADO_DocsReference_Organization}}
2727
AdoProject: ${{secrets.ADO_DocsReference_Project}}
28-
AdoPipelineId: ${{secrets.ADO_DocsReference_JumpPipeline_ID}}
29-
CheckInterval: 60
28+
AdoLatestPipelineId: ${{secrets.ADO_DocsReference_Latest_Pipeline_ID}}
29+
AdoLtsPipelineId: ${{secrets.ADO_DocsReference_LTS_Pipeline_ID}}
30+
ReleaseBranch: ${{ github.event.release.target_commitish }}
3031
run: |
3132
$organization = $env:AdoOrg
3233
$project = $env:AdoProject
33-
$definitionId = $env:AdoPipelineId
34-
$checkInterval = $env:CheckInterval
34+
$thisRepoLink = "${{ github.server_url }}/${{ github.repository }}"
3535
$thisRunLink = "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
36-
$triggerBranch = 'main'
37-
$variables = @('commitAuthor=azcli', 'triggerFromRepo=https://github.com/Azure/azure-cli', "triggerBranch=$triggerBranch", "triggerByPipeline=$thisRunLink")
36+
$triggerBranch = $env:ReleaseBranch
37+
$definitionId = $triggerBranch -eq 'release' ? $env:AdoLatestPipelineId : $env:AdoLtsPipelineId
38+
$variables = @("triggerBranch=$triggerBranch", "triggerFromRepo=$thisRepoLink", "triggerByPipeline=$thisRunLink")
3839
3940
$output = az pipelines build queue --definition-id $definitionId --project $project --organization $organization --variables @variables | ConvertFrom-Json -AsHashtable
4041
if ($? -eq $false)
4142
{
4243
$pipelineDefinitionLink = $organization + [uri]::EscapeDataString($project) + "/_build?definitionId=$definitionId"
4344
Write-Error "Failed to queue the pipeline run for $pipelineDefinitionLink, please check above error message."
4445
}
45-
$runIdInJumpPipeline = $output.id
46-
Write-Host "runIdInJumpPipeline: $runIdInJumpPipeline"
47-
do
48-
{
49-
Start-Sleep -Seconds $checkInterval
50-
$status = az pipelines runs show --query status --id $runIdInJumpPipeline --project $project --organization $organization --output tsv
51-
$currentTime = (Get-Date -AsUTC).ToString('yyyy-MM-dd HH:mm:ss')
52-
Write-Host "[UTC $currentTime] apidrop shared jump pipeline run status: $status"
53-
} while ($status -ne 'completed')
54-
$jumpOutput = az pipelines runs show --id $runIdInJumpPipeline --project $project --organization $organization | ConvertFrom-Json -AsHashtable
55-
56-
$targetPipelineResult = ($jumpOutput.tags -Match 'jump_return_result_(canceled|failed|partiallySucceeded|succeeded)')[0] -replace 'jump_return_result_', ''
57-
$runId = ($jumpOutput.tags -Match 'jump_return_id_\d+')[0] -replace 'jump_return_id_', ''
58-
$triggeredTargetPipeline = $runId ? $true : $false
59-
if ($triggeredTargetPipeline)
60-
{
61-
# apidrop shared jump pipeline triggered target pipeline
62-
$printMessage = 'Triggered reference pipeline run'
63-
$printMessage += $targetPipelineResult ? " with its result $targetPipelineResult" : '' # waited for completion or not
64-
}
65-
else
66-
{
67-
# apidrop shared jump pipeline may fail to trigger target pipeline
68-
$runId = $runIdInJumpPipeline
69-
$printMessage = "Jump pipeline run with $($jumpOutput.result) state may fail to trigger reference pipeline"
70-
}
46+
$runId = $output.id
7147
$runLink = $organization + [uri]::EscapeDataString($project) + "/_build/results?buildId=$runId"
72-
$printMessage += ", for details please check: $runLink"
73-
if ($triggeredTargetPipeline)
74-
{
75-
Write-Host $printMessage
76-
}
77-
else
78-
{
79-
Write-Error $printMessage
80-
}
48+
Write-Host "Triggered reference pipeline run, for details please check: $runLink"

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ parameters:
2727
default:
2828
- name: AMD64
2929
value: amd64
30-
pool: pool-ubuntu-2004-multi-core
30+
pool: pool-ubuntu-latest-multi-core
3131
- name: ARM64
3232
value: arm64
33-
pool: ubuntu-arm64-2004-pool
33+
pool: pool-ubuntu-latest-arm64
3434

3535
jobs:
3636
- job: CheckPullRequest
@@ -1056,7 +1056,7 @@ jobs:
10561056
10571057
- job: CheckHeaders
10581058
displayName: "Check License, History, and DocMap"
1059-
1059+
condition: and(not(contains(variables['Build.SourceBranch'], 'lts')), not(contains(variables['System.PullRequest.TargetBranch'], 'lts')))
10601060
pool:
10611061
name: ${{ variables.ubuntu_pool }}
10621062
steps:

scripts/live_test/CLITest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ variables:
2525
stages:
2626
# Azure DevOps limits the number of jobs to 256, so it must be split according to the platform and placed in different stages.
2727
- stage: TestUbuntu
28-
displayName: Live Test on Ubuntu 2004
28+
displayName: Live Test on Ubuntu latest
2929
condition: succeededOrFailed()
3030
jobs:
3131
- job: LiveTest
@@ -455,7 +455,7 @@ stages:
455455
if [[ "$(USER_TARGET)" =~ "$(Target)" || ("$(USER_TARGET)" == "main" && ! "$(Target)" =~ ^ext-.*) || ("$(USER_TARGET)" == "extensions" && "$(Target)" =~ ^ext-.*) || ("$(USER_TARGET)" == "ALL" || "$(USER_TARGET)" == "all" || "$(USER_TARGET)" == "") ]]; then
456456
echo "Match!"
457457
echo "##vso[task.setvariable variable=Match]1"
458-
echo "##vso[task.setvariable variable=platform]ubuntu2004"
458+
echo "##vso[task.setvariable variable=platform]ubuntulatest"
459459
else
460460
echo "Not match!"
461461
echo "##vso[task.setvariable variable=Match]0"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
homebrew-pypi-poet~=0.10.0
2-
jinja2==3.1.5
2+
jinja2~=3.1.6
33
requests>=2.20.0
44
applicationinsights >=0.11.1,<0.11.8

0 commit comments

Comments
 (0)