Skip to content

Commit e79e804

Browse files
authored
Merge branch 'main' into feature/isolated-dhcp-range
2 parents 1bade4b + 98b8f75 commit e79e804

508 files changed

Lines changed: 47662 additions & 6444 deletions

File tree

Some content is hidden

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

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.github/workflows/*.lock.yml linguist-generated=true merge=ours
1+
.github/workflows/*.lock.yml linguist-generated=true

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
/plugins/storage/volume/linstor @rp-
1919
/plugins/storage/volume/storpool @slavkap
20-
/plugins/storage/volume/ontap @rajiv-jain-netapp @sandeeplocharla @piyush5netapp @suryag1201
20+
/plugins/storage/volume/ontap @rajiv-jain-netapp @sandeeplocharla @piyush5netapp @suryag1201 @sathvikaragi @sp16743
2121

2222
.pre-commit-config.yaml @jbampton
2323
/.github/linters/ @jbampton

‎.github/aw/actions-lock.json‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"version": "v9.0.0",
66
"sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3"
77
},
8-
"github/gh-aw-actions/setup@v0.76.1": {
8+
"github/gh-aw-actions/setup@v1.0.1": {
99
"repo": "github/gh-aw-actions/setup",
10-
"version": "v0.76.1",
11-
"sha": "46d564922b082d0db93244972e8005ea6904ee5f"
10+
"version": "v1.0.1",
11+
"sha": "221ba4f4319de6b8e809d1a15528b3ae6a818aa5"
1212
}
1313
},
1414
"containers": {
@@ -22,11 +22,21 @@
2222
"digest": "sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731",
2323
"pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.25.55@sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731"
2424
},
25+
"ghcr.io/github/gh-aw-firewall/agent:0.29.0": {
26+
"image": "ghcr.io/github/gh-aw-firewall/agent:0.29.0",
27+
"digest": "sha256:b14bd399376180b5649a9324be3b50fbfc82bfe8f0c80045840416b5a4e65b96",
28+
"pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.29.0@sha256:b14bd399376180b5649a9324be3b50fbfc82bfe8f0c80045840416b5a4e65b96"
29+
},
2530
"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55": {
2631
"image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55",
2732
"digest": "sha256:4142b873b678cd3279b98dcbe464857d56ea2f2348719b00379cdf35dd843ff3",
2833
"pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55@sha256:4142b873b678cd3279b98dcbe464857d56ea2f2348719b00379cdf35dd843ff3"
2934
},
35+
"ghcr.io/github/gh-aw-firewall/api-proxy:0.29.0": {
36+
"image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.29.0",
37+
"digest": "sha256:baff00b856a4bdc93bce134928c70af3d3492f2e518757115042040674d56b0b",
38+
"pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.29.0@sha256:baff00b856a4bdc93bce134928c70af3d3492f2e518757115042040674d56b0b"
39+
},
3040
"ghcr.io/github/gh-aw-firewall/squid:0.18.0": {
3141
"image": "ghcr.io/github/gh-aw-firewall/squid:0.18.0",
3242
"digest": "sha256:82a5d062a5612a57a43a171a5b79ddbb690a86a8ddda02339cc1675131ae9f8b",
@@ -37,20 +47,25 @@
3747
"digest": "sha256:74084b704d8d3664a363655986664d70bd9cdb4830532d0b35cd784d867aabca",
3848
"pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.25.55@sha256:74084b704d8d3664a363655986664d70bd9cdb4830532d0b35cd784d867aabca"
3949
},
40-
"ghcr.io/github/gh-aw-mcpg:v0.1.4": {
41-
"image": "ghcr.io/github/gh-aw-mcpg:v0.1.4",
42-
"digest": "sha256:0acf25aa1d409f9c73be9e39ac84f4bd4b90d8bfa1db4dc6d7f47d38ccd58914",
43-
"pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.1.4@sha256:0acf25aa1d409f9c73be9e39ac84f4bd4b90d8bfa1db4dc6d7f47d38ccd58914"
50+
"ghcr.io/github/gh-aw-firewall/squid:0.29.0": {
51+
"image": "ghcr.io/github/gh-aw-firewall/squid:0.29.0",
52+
"digest": "sha256:6e0cbf7f980beb78b5461563a8164f6439ca959bc93733d5a6b52972e523ed50",
53+
"pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.29.0@sha256:6e0cbf7f980beb78b5461563a8164f6439ca959bc93733d5a6b52972e523ed50"
54+
},
55+
"ghcr.io/github/gh-aw-mcpg:v0.5.0": {
56+
"image": "ghcr.io/github/gh-aw-mcpg:v0.5.0",
57+
"digest": "sha256:d3544a4222e7efeeeb38669d8a1af0c72691c55b8f6506b15aa5920f7f31b7bc",
58+
"pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.5.0@sha256:d3544a4222e7efeeeb38669d8a1af0c72691c55b8f6506b15aa5920f7f31b7bc"
4459
},
45-
"ghcr.io/github/gh-aw-mcpg:v0.3.19": {
46-
"image": "ghcr.io/github/gh-aw-mcpg:v0.3.19",
47-
"digest": "sha256:a6c890d7c24d7190c9ef97b9c954cc4cffaae6b01c371ced1f959f1370b1f68f",
48-
"pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.3.19@sha256:a6c890d7c24d7190c9ef97b9c954cc4cffaae6b01c371ced1f959f1370b1f68f"
60+
"ghcr.io/github/gh-aw-node": {
61+
"image": "ghcr.io/github/gh-aw-node",
62+
"digest": "sha256:2c2ea524e648b91c8333ce246e3838fcf5b19ac70e45baac1a51b9207299749f",
63+
"pinned_image": "ghcr.io/github/gh-aw-node@sha256:2c2ea524e648b91c8333ce246e3838fcf5b19ac70e45baac1a51b9207299749f"
4964
},
50-
"ghcr.io/github/github-mcp-server:v0.30.3": {
51-
"image": "ghcr.io/github/github-mcp-server:v0.30.3",
52-
"digest": "sha256:a2b5fb79b1cee851bfc3532dfe480c3dc5736974ca9d93a7a9f68e52ce4b62a0",
53-
"pinned_image": "ghcr.io/github/github-mcp-server:v0.30.3@sha256:a2b5fb79b1cee851bfc3532dfe480c3dc5736974ca9d93a7a9f68e52ce4b62a0"
65+
"ghcr.io/github/github-mcp-server:v2.0.3": {
66+
"image": "ghcr.io/github/github-mcp-server:v2.0.3",
67+
"digest": "sha256:250bc6ce70788207608ef74cef4397230ff2e8481218da74d6093e4bd9101132",
68+
"pinned_image": "ghcr.io/github/github-mcp-server:v2.0.3@sha256:250bc6ce70788207608ef74cef4397230ff2e8481218da74d6093e4bd9101132"
5469
}
5570
}
5671
}

‎.github/scripts/post-compile.sh‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,20 @@ cd "$(git rev-parse --show-toplevel)"
3939
export NEWVAL='${{ needs.pick_copilot_token.outputs.name != '"'"''"'"' && secrets[format('"'"'COPILOT_GITHUB_TOKEN_{0}'"'"', needs.pick_copilot_token.outputs.name)] || secrets.COPILOT_GITHUB_TOKEN }}'
4040

4141
FILES=(
42-
".github/workflows/weekly-repo-status.lock.yml"
4342
".github/workflows/daily-issue-triage.lock.yml"
4443
)
4544

4645
fail() { echo "ERROR: $1" >&2; exit 1; }
4746

47+
# Counts fixed-string matches inside the agent job only (the detection job also has a
48+
# redact step, and that one must keep the base token).
49+
agent_count() {
50+
awk -v pat="$1" '
51+
/^ [A-Za-z0-9_-]+:[ \t]*$/ { inagent = ($0 ~ /^ agent:[ \t]*$/) }
52+
inagent && index($0, pat) { c++ }
53+
END { print c+0 }' "$2"
54+
}
55+
4856
# Fixes up `needs:` for the agent and pick_copilot_token jobs only; gh-aw adds
4957
# pick_copilot_token to several other jobs' needs and those must stay as-is.
5058
# Reads stdin, writes stdout. gh-aw emits inline needs (needs: foo) for single
@@ -108,14 +116,14 @@ for f in "${FILES[@]}"; do
108116

109117
# Repoint the redact step's SECRET_COPILOT_GITHUB_TOKEN the same way; the line is
110118
# unique to the agent job's "Redact secrets in logs" step.
111-
before=$(grep -cF 'SECRET_COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}' "$f" || true)
119+
before=$(agent_count 'SECRET_COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}' "$f")
112120
if [ "$before" -gt 1 ]; then
113121
fail "$f: expected at most one redact-step SECRET_COPILOT_GITHUB_TOKEN line, found $before"
114122
fi
115123
perl -0pi -e \
116124
's/^([ \t]*)SECRET_COPILOT_GITHUB_TOKEN:[ \t]*\$\{\{[ \t]*secrets\.COPILOT_GITHUB_TOKEN[ \t]*\}\}[ \t]*$/$1."SECRET_COPILOT_GITHUB_TOKEN: ".$ENV{NEWVAL}/me' \
117125
"$f"
118-
after=$(grep -cF 'SECRET_COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}' "$f" || true)
126+
after=$(agent_count 'SECRET_COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}' "$f")
119127
if [ "$before" -eq 1 ] && [ "$after" -eq 0 ]; then redact_edit="applied"
120128
elif [ "$before" -eq 0 ] && grep -qF 'SECRET_COPILOT_GITHUB_TOKEN: ${{ needs.pick_copilot_token.outputs.name' "$f"; then redact_edit="already"
121129
else fail "$f: redact-step SECRET_COPILOT_GITHUB_TOKEN line not patched (before=$before after=$after)"

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,7 @@ jobs:
5454
- name: Install Non-OSS
5555
uses: ./.github/actions/install-nonoss
5656
- name: Noredist Build
57+
env:
58+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5759
run: |
5860
mvn -B -P developer,systemvm -Dsimulator -Dnoredist clean install -T$(nproc)

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ jobs:
5454
git status
5555
ipmitool -V
5656
- name: Build with Maven
57+
env:
58+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5759
run: |
5860
mvn -B -P developer,systemvm -Dsimulator clean install -DskipTests=true -T$(nproc)
5961
- name: Archive artifacts
@@ -307,6 +309,8 @@ jobs:
307309
mkdir -p ~/.m2/repository
308310
tar -xzf /tmp/artifacts/m2-cloudstack.tar.gz -C ~/.m2/repository
309311
- name: Setup Simulator Prerequisites
312+
env:
313+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
310314
run: |
311315
sudo python3 -m pip install --upgrade netaddr mysql-connector-python
312316
python3 -m pip install --user --upgrade tools/marvin/dist/[mM]arvin-*.tar.gz
@@ -319,6 +323,8 @@ jobs:
319323
find . | grep "src/main/java" | sed 's/\/java\//\/java /g' | awk '{print "--sourcefiles", $1, "\\"}' | sort | uniq >> jacoco-report.sh
320324
echo "--xml jacoco-coverage.xml" >> jacoco-report.sh
321325
- name: Start CloudStack Management Server with Simulator
326+
env:
327+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
322328
run: |
323329
export MAVEN_OPTS="-Xmx4096m -XX:MaxMetaspaceSize=800m -Djava.security.egd=file:/dev/urandom -javaagent:jacoco/lib/jacocoagent.jar=address=*,port=36320,output=tcpserver --add-opens=java.base/java.lang=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED --add-opens=java.base/jdk.internal.reflect=ALL-UNNAMED"
324330
echo -e "\nStarting simulator"
@@ -329,6 +335,8 @@ jobs:
329335
echo -e "\nStarting Advanced Zone DataCenter deployment"
330336
python3 tools/marvin/marvin/deployDataCenter.py -i setup/dev/advdualzone.cfg 2>&1 || true
331337
- name: Run Integration Tests with Simulator
338+
env:
339+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
332340
run: |
333341
mkdir -p integration-test-results/smoke/misc
334342
mkdir -p integration-test-results/component

0 commit comments

Comments
 (0)