Skip to content

Commit 072a621

Browse files
choudharypr-microsoftchoudharypr-microsoft
committed
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions into user/priyansh/updateBIforAksDPP
2 parents b448866 + 4f9675f commit 072a621

File tree

3,637 files changed

+1523374
-981820
lines changed

Some content is hidden

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

3,637 files changed

+1523374
-981820
lines changed

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090

9191
/src/ip-group/ @necusjz @kairu-ms @jsntcy
9292

93-
/src/connectedk8s/ @bavneetsingh16 @deeksha345 @anagg929 @atchutbarli
93+
/src/connectedk8s/ @bavneetsingh16 @deeksha345 @anagg929 @atchutbarli @bgriddaluru
9494

9595
/src/storagesync/ @jsntcy
9696

@@ -240,7 +240,7 @@
240240

241241
/src/quota/ @kairu-ms @ZengTaoxu
242242

243-
/src/containerapp/ @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14
243+
/src/containerapp/ @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre @ShichaoQiu @bowen5
244244

245245
/src/scvmm/ @nascarsayan @hsurana06
246246

@@ -337,3 +337,5 @@
337337
/src/storage-discovery/ @shanefujs @calvinhzy
338338

339339
/src/aks-agent/ @feiskyer @mainred @nilo19
340+
341+
/src/migrate/ @saifaldin14

‎.github/policies/resourceManagement.yml‎

Lines changed: 77 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,17 @@ configuration:
657657
- us6193
658658
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
659659
assignMentionees: False
660+
- if:
661+
- hasLabel:
662+
label: Service Attention
663+
- hasLabel:
664+
label: Blob Storage SFTP
665+
then:
666+
- mentionUsers:
667+
mentionees:
668+
- greeshma-microsoft
669+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
670+
assignMentionees: False
660671
- if:
661672
- hasLabel:
662673
label: Service Attention
@@ -1454,7 +1465,7 @@ configuration:
14541465
then:
14551466
- mentionUsers:
14561467
mentionees:
1457-
- rgreenMSFT
1468+
- amarjeetkr
14581469
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
14591470
assignMentionees: False
14601471
- if:
@@ -1567,6 +1578,21 @@ configuration:
15671578
- nberdy
15681579
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
15691580
assignMentionees: False
1581+
- if:
1582+
- hasLabel:
1583+
label: Service Attention
1584+
- hasLabel:
1585+
label: Device Registry
1586+
then:
1587+
- mentionUsers:
1588+
mentionees:
1589+
- c-ryan-k
1590+
- digimaun
1591+
- rohankhandelwal
1592+
- mryanlo
1593+
- atastrophic
1594+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
1595+
assignMentionees: False
15701596
- if:
15711597
- hasLabel:
15721598
label: Service Attention
@@ -1588,7 +1614,6 @@ configuration:
15881614
- mentionUsers:
15891615
mentionees:
15901616
- anishtrakru
1591-
- derekbekoe
15921617
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
15931618
assignMentionees: False
15941619
- if:
@@ -1599,7 +1624,7 @@ configuration:
15991624
then:
16001625
- mentionUsers:
16011626
mentionees:
1602-
- sourabhguha
1627+
- YingXue
16031628
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
16041629
assignMentionees: False
16051630
- if:
@@ -1649,6 +1674,17 @@ configuration:
16491674
- Saglodha
16501675
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
16511676
assignMentionees: False
1677+
- if:
1678+
- hasLabel:
1679+
label: Service Attention
1680+
- hasLabel:
1681+
label: Fabric
1682+
then:
1683+
- mentionUsers:
1684+
mentionees:
1685+
- xinzhizou
1686+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
1687+
assignMentionees: False
16521688
- if:
16531689
- hasLabel:
16541690
label: Service Attention
@@ -1668,9 +1704,9 @@ configuration:
16681704
then:
16691705
- mentionUsers:
16701706
mentionees:
1671-
- AnatoliB
1672-
- Francisco-Gamino
1673-
- shreyabatra4
1707+
- kamperiadis
1708+
- amamounelsayed
1709+
- khkh-ms
16741710
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
16751711
assignMentionees: False
16761712
- if:
@@ -1765,20 +1801,8 @@ configuration:
17651801
then:
17661802
- mentionUsers:
17671803
mentionees:
1768-
- iluican
1769-
- jlian
1770-
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
1771-
assignMentionees: False
1772-
- if:
1773-
- hasLabel:
1774-
label: Service Attention
1775-
- hasLabel:
1776-
label: IotDPS
1777-
then:
1778-
- mentionUsers:
1779-
mentionees:
1780-
- iluican
1781-
- jlian
1804+
- digimaun
1805+
- Azure/azure-iot-cli-triage
17821806
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
17831807
assignMentionees: False
17841808
- if:
@@ -1976,6 +2000,9 @@ configuration:
19762000
mentionees:
19772001
- ambhatna
19782002
- deepthiprasad
2003+
- akning-ms
2004+
- junsu-msft
2005+
- coffeemug
19792006
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
19802007
assignMentionees: False
19812008
- if:
@@ -2316,6 +2343,9 @@ configuration:
23162343
mentionees:
23172344
- ambhatna
23182345
- deepthiprasad
2346+
- akning-ms
2347+
- junsu-msft
2348+
- coffeemug
23192349
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
23202350
assignMentionees: False
23212351
- if:
@@ -2329,6 +2359,9 @@ configuration:
23292359
- daeunyim
23302360
- rajsell
23312361
- deepthiprasad
2362+
- akning-ms
2363+
- junsu-msft
2364+
- coffeemug
23322365
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
23332366
assignMentionees: False
23342367
- if:
@@ -2725,8 +2758,11 @@ configuration:
27252758
then:
27262759
- mentionUsers:
27272760
mentionees:
2728-
- shariq-mcs
2729-
- MSFTeegarden
2761+
- abhijitch_microsoft
2762+
- yuvalm_microsoft
2763+
- nikitagarg_microsoft
2764+
- sanar_microsoft
2765+
- cawa_microsoft
27302766
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
27312767
assignMentionees: False
27322768
- if:
@@ -2839,10 +2875,10 @@ configuration:
28392875
then:
28402876
- mentionUsers:
28412877
mentionees:
2842-
- bleroy
2843-
- tjacobhi
2844-
- markheff
2845-
- miwelsh
2878+
- kuanlu95
2879+
- efrainretana
2880+
- mattgotteiner
2881+
- Draconicida
28462882
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
28472883
assignMentionees: False
28482884
- if:
@@ -2865,6 +2901,7 @@ configuration:
28652901
- mentionUsers:
28662902
mentionees:
28672903
- nazang
2904+
- mooshc
28682905
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
28692906
assignMentionees: False
28702907
- if:
@@ -3075,6 +3112,20 @@ configuration:
30753112
- S-J-M
30763113
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
30773114
assignMentionees: False
3115+
- if:
3116+
- hasLabel:
3117+
label: Service Attention
3118+
- hasLabel:
3119+
label: StorageDiscovery
3120+
then:
3121+
- mentionUsers:
3122+
mentionees:
3123+
- shanefujs
3124+
- apurv2304
3125+
- skallurk
3126+
- vdziunms
3127+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
3128+
assignMentionees: False
30783129
- if:
30793130
- hasLabel:
30803131
label: Service Attention

‎.github/workflows/TestTriggerExtensionRelease.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313

1414
jobs:
1515
build:
16-
name: Trigger Extension Release Pipeline
16+
name: Test Trigger Extension Release Pipeline
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Harden Runner
@@ -26,7 +26,7 @@ jobs:
2626
client-id: ${{ secrets.ADO_SP_ClientID }}
2727
tenant-id: ${{ secrets.ADO_SP_TenantID }}
2828
allow-no-subscriptions: true
29-
- name: Trigger ADO Pipeline and Wait for Completion
29+
- name: Test Trigger ADO Pipeline and Wait for Completion
3030
uses: azure/cli@v2
3131
env:
3232
ado-org: ${{secrets.ADO_ORGANIZATION}}
@@ -89,7 +89,7 @@ jobs:
8989
exit 1
9090
fi
9191
92-
# Wait 30 seconds before checking again
93-
echo "Build still running... waiting 30 seconds"
94-
sleep 30
92+
# Wait 60 seconds before checking again
93+
echo "Build still running... waiting 60 seconds"
94+
sleep 60
9595
done

‎.github/workflows/TriggerExtensionRelease.yml‎

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
client-id: ${{ secrets.ADO_SP_ClientID }}
2727
tenant-id: ${{ secrets.ADO_SP_TenantID }}
2828
allow-no-subscriptions: true
29-
- name: Azure CLI
29+
- name: Trigger ADO Pipeline and Wait for Completion
3030
uses: azure/cli@v2
3131
env:
3232
ado-org: ${{secrets.ADO_ORGANIZATION}}
@@ -35,4 +35,61 @@ jobs:
3535
commit-id: ${{ github.sha }}
3636
with:
3737
inlineScript: |
38-
az pipelines build queue --definition-id ${{ env.ado-pipeline-id }} --organization ${{ env.ado-org }} --project ${{ env.ado-project }} --variables commit_id=${{ env.commit-id }}
38+
# Trigger the pipeline and capture the build ID
39+
echo "Triggering ADO pipeline..."
40+
BUILD_RESULT=$(az pipelines build queue \
41+
--definition-id ${{ env.ado-pipeline-id }} \
42+
--organization ${{ env.ado-org }} \
43+
--project ${{ env.ado-project }} \
44+
--variables commit_id=${{ env.commit-id }} \
45+
--output json)
46+
47+
BUILD_ID=$(echo $BUILD_RESULT | jq -r '.id')
48+
echo "Pipeline triggered with Build ID: $BUILD_ID"
49+
50+
if [ "$BUILD_ID" = "null" ] || [ -z "$BUILD_ID" ]; then
51+
echo "Failed to get build ID from pipeline trigger"
52+
exit 1
53+
fi
54+
55+
# Wait for the build to complete
56+
echo "Waiting for build $BUILD_ID to complete..."
57+
while true; do
58+
BUILD_JSON=$(az pipelines build show \
59+
--id $BUILD_ID \
60+
--organization ${{ env.ado-org }} \
61+
--project ${{ env.ado-project }} \
62+
--output json)
63+
64+
BUILD_STATUS=$(echo "$BUILD_JSON" | jq -r '.status')
65+
BUILD_RESULT_STATUS=$(echo "$BUILD_JSON" | jq -r '.result // "none"')
66+
67+
echo "Current status: $BUILD_STATUS, Result: $BUILD_RESULT_STATUS"
68+
69+
# Check if build is completed
70+
if [ "$BUILD_STATUS" = "completed" ]; then
71+
echo "Build completed with result: $BUILD_RESULT_STATUS"
72+
73+
# Check if the build was successful
74+
if [ "$BUILD_RESULT_STATUS" = "succeeded" ]; then
75+
echo "✅ ADO pipeline build succeeded!"
76+
exit 0
77+
elif [ "$BUILD_RESULT_STATUS" = "partiallySucceeded" ]; then
78+
echo "⚠️ ADO pipeline build partially succeeded"
79+
exit 1
80+
else
81+
echo "❌ ADO pipeline build failed with result: $BUILD_RESULT_STATUS"
82+
exit 1
83+
fi
84+
fi
85+
86+
# Check for other terminal states
87+
if [ "$BUILD_STATUS" = "cancelling" ] || [ "$BUILD_STATUS" = "cancelled" ]; then
88+
echo "❌ ADO pipeline build was cancelled"
89+
exit 1
90+
fi
91+
92+
# Wait 60 seconds before checking again
93+
echo "Build still running... waiting 60 seconds"
94+
sleep 60
95+
done

‎azure-pipelines.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ jobs:
9090
name: ${{ variables.ubuntu_pool }}
9191
strategy:
9292
matrix:
93-
Python39:
94-
python.version: '3.9'
9593
Python310:
9694
python.version: '3.10'
9795
Python311:

0 commit comments

Comments
 (0)