Skip to content

Commit d6ceeb3

Browse files
author
Shichao Qiu
committed
Merge remote-tracking branch 'remotes/origin/main' into shiqiu/supportShellAndGpu0924
2 parents f8d29fe + 8cddcaf commit d6ceeb3

File tree

2,653 files changed

+620537
-388947
lines changed

Some content is hidden

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

2,653 files changed

+620537
-388947
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,3 +337,5 @@
337337
/src/storage-discovery/ @shanefujs @calvinhzy
338338

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

.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

scripts/ci/azdev_linter_style.py

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,27 @@ def azdev_on_external_extension(index_json, azdev_type):
179179
with open(index_json, 'r') as fd:
180180
current_extensions = json.loads(fd.read()).get("extensions")
181181

182+
def entry_equals_ignore_url(entry1, entry2):
183+
"""Compare two entries ignoring downloadUrl field"""
184+
entry1_copy = entry1.copy()
185+
entry2_copy = entry2.copy()
186+
entry1_copy.pop('downloadUrl', None)
187+
entry2_copy.pop('downloadUrl', None)
188+
return entry1_copy == entry2_copy
189+
182190
for name in current_extensions:
183-
modified_entries = [entry for entry in current_extensions[name] if entry not in public_extensions.get(name, [])]
191+
public_entries = public_extensions.get(name, [])
192+
193+
# Find modified entries by comparing without downloadUrl
194+
modified_entries = []
195+
for entry in current_extensions[name]:
196+
is_modified = True
197+
for public_entry in public_entries:
198+
if entry_equals_ignore_url(entry, public_entry):
199+
is_modified = False
200+
break
201+
if is_modified:
202+
modified_entries.append(entry)
184203

185204
if not modified_entries:
186205
continue
@@ -204,7 +223,7 @@ def azdev_on_external_extension(index_json, azdev_type):
204223
# azdev test support external extension
205224
# azdev_extension.style()
206225

207-
logger.info('Checking service name for external extensions')
226+
logger.info('Checking service name for external extensions: %s', name)
208227
service_name.check()
209228

210229
az_extension.remove()
@@ -245,7 +264,7 @@ def azdev_on_internal_extension(modified_files, azdev_type):
245264
logger.error(statement_msg)
246265
exit(1)
247266

248-
logger.info('Checking service name for internal extensions')
267+
logger.info('Checking service name for internal extensions: %s', name)
249268
service_name.check()
250269

251270
azdev_extension.remove()

scripts/ci/find_extension_upgraded.py

Lines changed: 0 additions & 141 deletions
This file was deleted.

src/aks-agent/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Ignore Poetry artifacts
2+
poetry.lock
3+
pyproject.toml

src/aks-agent/HISTORY.rst

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,37 @@ To release a new version, please select a new version number (usually plus 1 to
1111

1212
Pending
1313
+++++++
14+
* Fix stdin reading hang in CI/CD pipelines by using select with timeout for non-interactive mode.
15+
* Update pytest marker registration and fix datetime.utcnow() deprecation warning in tests.
16+
* Improve test framework with real-time stderr output visibility and subprocess timeout.
17+
18+
1.0.0b7
19+
+++++++
20+
* Bump aks-mcp to v0.0.10 - here are the notable changes:
21+
* Fix: Improved server health check endpoints /health for both HTTP and SSE connections for http, sse
22+
* Fix: enforce json output for az monitor metrics and aks tools
23+
* Fix: Build the resource URL with correct MCP endpoint path based on transport
24+
* Fix feedback slash command
25+
26+
1.0.0b6
27+
+++++++
28+
* Introduce the new `az aks agent-init` command for better cli interaction.
29+
* Separate llm configuration from main agent command for improved clarity and extensibility.
30+
31+
1.0.0b5
32+
+++++++
33+
* Bump holmesgpt to 0.15.0 - Enhanced AI debugging experience and bug fixes
34+
* Added TODO list feature to allows holmes to reliably answers questions it wasn't able to answer before due to early-stopping
35+
* Fixed mcp server http connection fails when using socks proxy by adding the missing socks dependency
36+
* Fixed gpt-5 temperature bug by upgrading litellm and dropping non-1 values for temperature
37+
* Improved the installation time by removing unnecessary dependencies and move test dependencies to dev dependency group
38+
* Added Feedback slash command Feature to allow users to provide feedback on their experience with the agent performance
39+
* Disable prometheus toolset loading by default to workaround the libbz2-dev missing issue in Azure CLI python environment.
40+
41+
1.0.0b4
42+
+++++++
43+
* Fix the --aks-mcp flag to allow true/false values.
44+
* Bump aks-mcp version to v0.0.9
1445

1546
1.0.0b3
1647
+++++++

0 commit comments

Comments
 (0)