Skip to content

Commit 5ac8c50

Browse files
a0x1aba0x1ab
authored
Merge branch 'Azure:main' into main
2 parents 87c2c79 + 4c81161 commit 5ac8c50

File tree

4,771 files changed

+1775962
-592734
lines changed

Some content is hidden

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

4,771 files changed

+1775962
-592734
lines changed

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262

6363
/src/aks-preview/ @andyzhangx @andyliuliming @fumingzhang
6464

65+
/src/aks-agent/ @nilo19 @mainerd
66+
6567
/src/bastion/ @aavalang
6668

6769
/src/vm-repair/ @haagha
@@ -88,7 +90,7 @@
8890

8991
/src/ip-group/ @necusjz @kairu-ms @jsntcy
9092

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

9395
/src/storagesync/ @jsntcy
9496

@@ -310,8 +312,6 @@
310312

311313
/src/site-recovery/ @calvinhzy
312314

313-
/src/hdinsightonaks/ @aim-for-better @yuc-Li
314-
315315
/src/network-analytics/ @pikanghosh1
316316

317317
/src/azurelargeinstance/ @8Gitbrix
@@ -333,3 +333,7 @@
333333
/src/carbon/ @itiinani
334334

335335
/src/amlfs/ @Aman-Jain-14 @amajai @mawhite @brpanask @tibanyas
336+
337+
/src/storage-discovery/ @shanefujs @calvinhzy
338+
339+
/src/aks-agent/ @feiskyer @mainred @nilo19

‎.github/policies/resourceManagement.yml‎

Lines changed: 83 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,19 @@ configuration:
606606
- kushagraThapar
607607
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
608608
assignMentionees: False
609+
- if:
610+
- hasLabel:
611+
label: Service Attention
612+
- hasLabel:
613+
label: AzureDataTransfer
614+
then:
615+
- mentionUsers:
616+
mentionees:
617+
- lasuredd-msft
618+
- fzkhan
619+
- pkuma-msft
620+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
621+
assignMentionees: False
609622
- if:
610623
- hasLabel:
611624
label: Service Attention
@@ -614,13 +627,11 @@ configuration:
614627
then:
615628
- mentionUsers:
616629
mentionees:
617-
- mksuni
618-
- bgklein
619-
- mscurrell
620630
- dpwatrous
621-
- gingi
622-
- paterasMSFT
631+
- wiboris
623632
- cRui861
633+
- skapur12
634+
- wanghoppe
624635
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
625636
assignMentionees: False
626637
- if:
@@ -642,8 +653,8 @@ configuration:
642653
then:
643654
- mentionUsers:
644655
mentionees:
645-
- cabbpt
646-
- theelderwand
656+
- muazmian
657+
- us6193
647658
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
648659
assignMentionees: False
649660
- if:
@@ -1458,6 +1469,19 @@ configuration:
14581469
- NateB2
14591470
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
14601471
assignMentionees: False
1472+
- if:
1473+
- hasLabel:
1474+
label: Service Attention
1475+
- hasLabel:
1476+
label: Data Transfer
1477+
then:
1478+
- mentionUsers:
1479+
mentionees:
1480+
- fzkhan
1481+
- lasuredd-msft
1482+
- pkuma-msft
1483+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
1484+
assignMentionees: False
14611485
- if:
14621486
- hasLabel:
14631487
label: Service Attention
@@ -1576,7 +1600,6 @@ configuration:
15761600
- mentionUsers:
15771601
mentionees:
15781602
- sourabhguha
1579-
- inesk-vt
15801603
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
15811604
assignMentionees: False
15821605
- if:
@@ -1952,7 +1975,10 @@ configuration:
19521975
- mentionUsers:
19531976
mentionees:
19541977
- ambhatna
1955-
- savjani
1978+
- deepthiprasad
1979+
- akning-ms
1980+
- junsu-msft
1981+
- coffeemug
19561982
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
19571983
assignMentionees: False
19581984
- if:
@@ -2219,6 +2245,7 @@ configuration:
22192245
- mentionUsers:
22202246
mentionees:
22212247
- AzMonEssential
2248+
- LarryZhang19
22222249
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
22232250
assignMentionees: False
22242251
- if:
@@ -2269,6 +2296,19 @@ configuration:
22692296
- AzMonEssential
22702297
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
22712298
assignMentionees: False
2299+
- if:
2300+
- hasLabel:
2301+
label: Service Attention
2302+
- hasLabel:
2303+
label: Monitor - ScheduledQueryRule
2304+
then:
2305+
- mentionUsers:
2306+
mentionees:
2307+
- azmonapplicationinsights
2308+
- asafst
2309+
- efratbp
2310+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
2311+
assignMentionees: False
22722312
- if:
22732313
- hasLabel:
22742314
label: Service Attention
@@ -2278,7 +2318,10 @@ configuration:
22782318
- mentionUsers:
22792319
mentionees:
22802320
- ambhatna
2281-
- savjani
2321+
- deepthiprasad
2322+
- akning-ms
2323+
- junsu-msft
2324+
- coffeemug
22822325
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
22832326
assignMentionees: False
22842327
- if:
@@ -2291,6 +2334,10 @@ configuration:
22912334
mentionees:
22922335
- daeunyim
22932336
- rajsell
2337+
- deepthiprasad
2338+
- akning-ms
2339+
- junsu-msft
2340+
- coffeemug
22942341
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
22952342
assignMentionees: False
22962343
- if:
@@ -2700,6 +2747,7 @@ configuration:
27002747
- mentionUsers:
27012748
mentionees:
27022749
- jfggdl
2750+
- damodaravadhani
27032751
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
27042752
assignMentionees: False
27052753
- if:
@@ -2747,6 +2795,17 @@ configuration:
27472795
- stephbaron
27482796
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
27492797
assignMentionees: False
2798+
- if:
2799+
- hasLabel:
2800+
label: Service Attention
2801+
- hasLabel:
2802+
label: ResourceMover
2803+
then:
2804+
- mentionUsers:
2805+
mentionees:
2806+
- yashjain4
2807+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
2808+
assignMentionees: False
27502809
- if:
27512810
- hasLabel:
27522811
label: Service Attention
@@ -3011,6 +3070,20 @@ configuration:
30113070
- xgithubtriage
30123071
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
30133072
assignMentionees: False
3073+
- if:
3074+
- hasLabel:
3075+
label: Service Attention
3076+
- hasLabel:
3077+
label: Storage Action
3078+
then:
3079+
- mentionUsers:
3080+
mentionees:
3081+
- blueww
3082+
- sshankMSFT
3083+
- golddove
3084+
- S-J-M
3085+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
3086+
assignMentionees: False
30143087
- if:
30153088
- hasLabel:
30163089
label: Service Attention

‎.github/workflows/TestTriggerExtensionRelease.yml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
name: Trigger ADO OneBranch Extension Release Pipeline
2+
3+
# Run this workflow every time a commit gets pushed to main
4+
# This triggers the ADO OneBranch Extension Release Pipeline
5+
on:
6+
push:
7+
branches:
8+
- main
9+
10+
permissions:
11+
contents: read
12+
id-token: write
13+
14+
jobs:
15+
build:
16+
name: Trigger Extension Release Pipeline
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Harden Runner
20+
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
21+
with:
22+
egress-policy: audit
23+
- name: Azure login
24+
uses: azure/login@v2
25+
with:
26+
client-id: ${{ secrets.ADO_SP_ClientID }}
27+
tenant-id: ${{ secrets.ADO_SP_TenantID }}
28+
allow-no-subscriptions: true
29+
- name: Trigger ADO Pipeline and Wait for Completion
30+
uses: azure/cli@v2
31+
env:
32+
ado-org: ${{secrets.ADO_ORGANIZATION}}
33+
ado-project: ${{secrets.ADO_PROJECT}}
34+
ado-pipeline-id: 396380
35+
commit-id: ${{ github.sha }}
36+
with:
37+
inlineScript: |
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 30 seconds before checking again
93+
echo "Build still running... waiting 30 seconds"
94+
sleep 30
95+
done

0 commit comments

Comments
 (0)