Skip to content

Commit 9f3c740

Browse files
authored
Merge for 3.0 April 2026 Update (#16376)
2 parents 25bde1f + 4a3f500 commit 9f3c740

File tree

305 files changed

+20183
-1828
lines changed

Some content is hidden

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

305 files changed

+20183
-1828
lines changed
Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# Copyright (c) Microsoft Corporation.
2+
# Licensed under the MIT License.
3+
4+
# This action checks that required kernel configs have not been removed or
5+
# modified to an undesirable value.
6+
name: Kernel Required Configs Check
7+
8+
on:
9+
push:
10+
branches: [3.0*, fasttrack/*]
11+
paths:
12+
- 'SPECS/kernel*/config*'
13+
pull_request:
14+
branches: [3.0*, fasttrack/*]
15+
paths:
16+
- 'SPECS/kernel*/config*'
17+
18+
jobs:
19+
check:
20+
name: Kernel configs check
21+
runs-on: ubuntu-latest
22+
23+
steps:
24+
# Checkout the branch of our repo that triggered this action
25+
- name: Workflow trigger checkout
26+
uses: actions/checkout@v4
27+
28+
- name: Get base commit for PRs
29+
if: ${{ github.event_name == 'pull_request' }}
30+
run: |
31+
git fetch origin ${{ github.base_ref }}
32+
echo "base_sha=$(git rev-parse origin/${{ github.base_ref }})" >> $GITHUB_ENV
33+
echo "Merging ${{ github.sha }} into ${{ github.base_ref }}"
34+
35+
- name: Get base commit for Pushes
36+
if: ${{ github.event_name == 'push' }}
37+
run: |
38+
git fetch origin ${{ github.event.before }}
39+
echo "base_sha=${{ github.event.before }}" >> $GITHUB_ENV
40+
echo "Merging ${{ github.sha }} into ${{ github.event.before }}"
41+
42+
# For consistency, we use the same major/minor version of Python that Azure Linux ships
43+
- name: Setup Python 3.12
44+
uses: actions/setup-python@v5
45+
with:
46+
python-version: 3.12
47+
48+
- name: Get Python dependencies
49+
run: python3 -m pip install -r toolkit/scripts/requirements.txt
50+
51+
# Check if kernel configs changed
52+
- name: Check if config files changed
53+
run: |
54+
echo "Files changed: '$(git diff-tree --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }})'"
55+
changed_configs=$(git diff-tree --diff-filter=d --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }} | { grep "SPECS/kernel.*/config.*$" || test $? = 1; })
56+
echo "Files to validate: '${changed_configs}'"
57+
echo "updated_configs<<EOF" >> $GITHUB_ENV
58+
echo "${changed_configs}" >> $GITHUB_ENV
59+
echo "EOF" >> $GITHUB_ENV
60+
61+
# Run kernel config checker against each changed config file
62+
- name: Run kernel config checking script
63+
if: ${{ env.updated_configs != '' }}
64+
run: |
65+
JSON_PATH="toolkit/scripts/kernel_config_checker/kernel_configs_json/azl3-os-required-kernel-configs.json"
66+
67+
# Extract kernel names that have overrides in the JSON (these are the kernels we track)
68+
tracked_kernels=$(python3 -c "
69+
import json
70+
with open('${JSON_PATH}') as f:
71+
data = json.load(f)
72+
for o in data['overrides']:
73+
print(o['name'])
74+
")
75+
echo "Tracked kernels: ${tracked_kernels}"
76+
77+
failed=0
78+
holder="${{ env.updated_configs }}"
79+
for file in $holder; do
80+
# Extract kernel name from path (e.g., SPECS/kernel-hwe/config -> kernel-hwe)
81+
kernel_name=$(echo "$file" | sed 's|SPECS/\([^/]*\)/.*|\1|')
82+
83+
# Skip kernels that don't have overrides in the JSON
84+
if ! echo "${tracked_kernels}" | grep -qx "${kernel_name}"; then
85+
echo "============================================"
86+
echo "Skipping: ${file} (kernel=${kernel_name} not tracked in JSON)"
87+
echo "============================================"
88+
continue
89+
fi
90+
91+
# Determine architecture from filename
92+
if [[ "$file" == *"aarch64"* ]]; then
93+
arch="arm64"
94+
else
95+
arch="x86_64"
96+
fi
97+
98+
echo "============================================"
99+
echo "Checking: ${file} (kernel=${kernel_name}, arch=${arch})"
100+
echo "============================================"
101+
102+
if ! (cd toolkit/scripts && python3 -m kernel_config_checker.check_config \
103+
"../../${file}" \
104+
kernel_config_checker/kernel_configs_json/azl3-os-required-kernel-configs.json \
105+
"${kernel_name}" "${arch}"); then
106+
failed=1
107+
fi
108+
done
109+
110+
if [ "$failed" -eq 1 ]; then
111+
echo ""
112+
echo "✗ One or more kernel config checks failed"
113+
exit 1
114+
fi
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
distroless-packages-base
2-
nodejs
3-
nodejs-npm
2+
nodejs24
3+
nodejs24-npm
44
prebuilt-ca-certificates
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nodejs
1+
nodejs24
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
ca-certificates
2-
nodejs
3-
nodejs-npm
2+
nodejs24
3+
nodejs24-npm

.pipelines/fasttrack/FasttrackMergeNotifier.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ extends:
1515
template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates
1616
parameters:
1717
featureFlags:
18+
use1esentry: false # this disables 1es entrypoint which is a workaround for issues from IcM https://portal.microsofticm.com/imp/v5/incidents/details/743308145/summary
1819
LinuxHostVersion:
1920
Network: R1
2021
runOnHost: true

.pipelines/prchecks/DevPRCheck.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ extends:
2626
template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates
2727
parameters:
2828
featureFlags:
29+
use1esentry: false # this disables 1es entrypoint which is a workaround for issues from IcM https://portal.microsofticm.com/imp/v5/incidents/details/743308145/summary
2930
LinuxHostVersion:
3031
Network: R1
3132
globalSdl:

.pipelines/prchecks/FastTrackPRCheck.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ extends:
2626
template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates
2727
parameters:
2828
featureFlags:
29+
use1esentry: false # this disables 1es entrypoint which is a workaround for issues from IcM https://portal.microsofticm.com/imp/v5/incidents/details/743308145/summary
2930
LinuxHostVersion:
3031
Network: R1
3132
globalSdl:

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSES-AND-NOTICES/SPECS/data/licenses.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,7 @@
547547
"Judy",
548548
"jurand",
549549
"kata-containers",
550+
"kata-containers-preview",
550551
"kde-filesystem",
551552
"kde-settings",
552553
"kernel-srpm-macros",
@@ -2837,6 +2838,7 @@
28372838
"kernel-mshv",
28382839
"kernel-rt",
28392840
"kernel-uvm",
2841+
"kernel-uvm-micro",
28402842
"keyutils",
28412843
"kmod",
28422844
"krb5",
@@ -3170,7 +3172,12 @@
31703172
"Source project": {
31713173
"license": "Same as the source project.",
31723174
"specs": [
3173-
"python-nocaselist"
3175+
"azure-vm-utils",
3176+
"bootengine",
3177+
"coreos-cloudinit",
3178+
"coreos-init",
3179+
"python-nocaselist",
3180+
"update-ssh-keys"
31743181
]
31753182
},
31763183
"Sysbench source": {

SPECS-EXTENDED/389-ds-base/389-ds-base.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ExcludeArch: i686
6868
Summary: 389 Directory Server (%{variant})
6969
Name: 389-ds-base
7070
Version: 3.1.1
71-
Release: 10%{?dist}
71+
Release: 11%{?dist}
7272
License: GPL-3.0-or-later AND (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT) AND (CC-BY-4.0 AND MIT) AND (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (MIT OR CC0-1.0) AND (MIT OR Unlicense) AND 0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MIT AND ISC AND MPL-2.0 AND PSF-2.0
7373
URL: https://www.port389.org
7474
Vendor: Microsoft Corporation
@@ -733,6 +733,9 @@ exit 0
733733
%endif
734734

735735
%changelog
736+
* Wed Feb 11 2026 BinduSri Adabala <v-badabala@microsoft.com> - 3.1.1-11
737+
- Bump release to rebuild with rust
738+
736739
* Mon Feb 02 2026 Archana Shettigar <v-shettigara@microsoft.com> - 3.1.1-10
737740
- Bump release to rebuild with rust
738741

0 commit comments

Comments
 (0)