Skip to content

Commit 020c77a

Browse files
mbykhovtsev-msmbykhovtsev-ms
committed
Merge branch '3.0-dev' into mbykhovtsev/3.0-sync
2 parents 62b9480 + 19de5a0 commit 020c77a

97 files changed

Lines changed: 5409 additions & 427 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.

‎.github/workflows/check-package-cgmanifest.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ jobs:
5151
if: ${{ env.updated-specs != '' }}
5252
run: sudo make -C toolkit -j$(nproc) chroot-tools REBUILD_TOOLS=y DAILY_BUILD_ID=lkg
5353

54+
- name: Generate the macros file with version/release info
55+
if: ${{ env.updated-specs != '' }}
56+
run: sudo make -C toolkit -j$(nproc) generate-versions-macros-file REBUILD_TOOLS=y DAILY_BUILD_ID=lkg
57+
5458
- name: Check each spec
5559
if: ${{ env.updated-specs != '' }}
56-
run: .github/workflows/validate-cg-manifest.sh build/worker/worker_chroot.tar.gz ${{ env.updated-specs }}
60+
run: .github/workflows/validate-cg-manifest.sh build/worker/worker_chroot.tar.gz build/pkg_artifacts/macros.releaseversions ${{ env.updated-specs }}

‎.github/workflows/check-source-signatures.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ jobs:
6060
for pkg in $changed_pkg_dirs; do
6161
changed_pkgs="$changed_pkgs $(find ${{ matrix.specs-dir }}/$pkg -name '*.spec' -exec basename {} .spec \; | xargs)"
6262
done
63+
# Trim leading/trailing whitespace.
64+
changed_pkgs=$(echo $changed_pkgs)
6365
6466
echo "Packages modified in this PR:"
6567
echo "${{ matrix.specs-dir }}: '${changed_pkgs}'"
@@ -81,19 +83,26 @@ jobs:
8183
8284
sudo make -C toolkit -j$(nproc) chroot-tools REBUILD_TOOLS=y DAILY_BUILD_ID=${LKG_BUILD_ID}
8385
86+
# Generate the macros.releaseversions file that is needed by the signature check.
87+
# The file contains versions and releases of all packages under SPECS folder.
88+
sudo make -C toolkit -j$(nproc) generate-versions-macros-file REBUILD_TOOLS=y DAILY_BUILD_ID=${LKG_BUILD_ID}
89+
8490
- name: Check for invalid source signatures
8591
run: |
8692
if [ -z "${{ env.changed_pkgs }}" ]; then
87-
echo "No package changes detected in '${{ matrix.specs-dir }}''."
93+
echo "No package changes detected in '${{ matrix.specs-dir }}'."
8894
exit 0
8995
fi
9096
97+
MACROS_RELEASEVERSIONS_PATH="$(realpath -e build/pkg_artifacts/macros.releaseversions)"
98+
echo "Using macros.releaseversions at: $MACROS_RELEASEVERSIONS_PATH"
99+
91100
set -x
92-
if ! sudo make -C toolkit -j$(nproc) input-srpms REBUILD_TOOLS=y DAILY_BUILD_ID=${{ env.LKG_BUILD_ID }} SRPM_PACK_LIST="${{ env.changed_pkgs }}" SPECS_DIR=../${{ matrix.specs-dir }}; then
101+
if ! sudo make -C toolkit -j$(nproc) input-srpms REBUILD_TOOLS=y DAILY_BUILD_ID=${{ env.LKG_BUILD_ID }} SRPM_PACK_LIST="${{ env.changed_pkgs }}" SPECS_DIR=../${{ matrix.specs-dir }} EXTRA_MACROS_FILES="$MACROS_RELEASEVERSIONS_PATH"; then
93102
set +x
94103
printf "\n\n******************************\n"
95104
echo "Failed to check the signatures of the modified packages."
96-
echo "Check the logs above for details on the mismatches files and their expected hashes."
105+
echo "Check the logs above for details on the mismatched files and their expected hashes."
97106
echo "Consider running: sudo make -C toolkit input-srpms REBUILD_TOOLS=y SRPM_PACK_LIST='${{ env.changed_pkgs }}' SPECS_DIR=../${{ matrix.specs-dir }}"
98107
printf "******************************\n\n"
99108
exit 1

‎.github/workflows/validate-cg-manifest.sh‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
# - The URL listed in the cgmanifets is valid (can be downloaded)
1111

1212
# $1 - Path to worker chroot's archive
13-
# $2+ - Paths to spec files to check
13+
# $2 - Path to macros.releaseversions file to copy to the chroot for rpmspec parsing
14+
# $3+ - Paths to spec files to check
1415

1516
set -euo pipefail
1617

@@ -90,14 +91,16 @@ chroot_rpmspec() {
9091
prepare_chroot_environment() {
9192
local chroot_archive
9293
local chroot_dir_path
94+
local macros_file
9395
local chroot_rpm_macros_dir_path
9496
local dist_name
9597
local dist_number
9698
local dist_tag
9799
local rpm_macros_dir_path
98100

99101
chroot_archive="$1"
100-
chroot_dir_path="$2"
102+
chroot_dir_path="$3"
103+
macros_file="$2"
101104

102105
echo "Creating worker chroot under '$chroot_dir_path'."
103106

@@ -124,10 +127,13 @@ prepare_chroot_environment() {
124127
sudo cp -v "$macro_file" "$chroot_rpm_macros_dir_path"
125128
done
126129

130+
echo "Copying the version/release macros file to the chroot."
131+
sudo cp -v "$macros_file" "$chroot_rpm_macros_dir_path"
132+
127133
echo
128134
}
129135

130-
if [[ $# -lt 2 ]]; then
136+
if [[ $# -lt 3 ]]; then
131137
echo "No specs passed to validate."
132138
exit 1
133139
fi
@@ -137,6 +143,11 @@ if [[ ! -f "$1" ]]; then
137143
exit 1
138144
fi
139145

146+
if [[ ! -f "$2" ]]; then
147+
echo "Second argument is not a valid file. Please pass the path to the macros.releaseversions file to copy to the chroot."
148+
exit 1
149+
fi
150+
140151
rm -f bad_registrations.txt
141152

142153
WORK_DIR=$(mktemp -d -t)
@@ -146,9 +157,10 @@ function clean_up {
146157
}
147158
trap clean_up EXIT SIGINT SIGTERM
148159

149-
prepare_chroot_environment "$1" "$WORK_DIR"
160+
prepare_chroot_environment "$1" "$2" "$WORK_DIR"
150161

151162
shift # Remove the first argument (the chroot archive) from the list of specs to check.
163+
shift # Remove the second argument (the macros.releaseversions file) from the list of specs to check.
152164
echo "Checking $# specs."
153165

154166
i=0

‎SPECS-SIGNED/iser-hwe-signed/iser-hwe-signed.spec‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,23 @@
3030
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
3131
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
3232

33-
# hard code versions due to ADO bug:58993948
34-
%global target_azl_build_kernel_version 6.12.78.2
35-
%global target_kernel_release 1
33+
34+
%global target_azl_build_kernel_version %azl_kernel_hwe_version
35+
%global target_kernel_release %azl_kernel_hwe_release
36+
%global target_mlnx_ofa_kernel_version %azl_mlnx_ofa_kernel_hwe_version
37+
%global target_mlnx_ofa_kernel_release %azl_mlnx_ofa_kernel_hwe_release
3638
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3739
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3840

3941
%global KVERSION %{target_kernel_version_full}
4042

4143
%{!?_name: %define _name iser-hwe}
42-
%{!?_mofed_full_version: %define _mofed_full_version 25.07-7%{release_suffix}%{?dist}}
44+
%{!?_mofed_full_version: %define _mofed_full_version %{target_mlnx_ofa_kernel_version}-%{target_mlnx_ofa_kernel_release}%{?dist}}
4345

4446
Summary: %{_name} Driver
4547
Name: %{_name}-signed
4648
Version: 25.07
47-
Release: 7%{release_suffix}%{?dist}
49+
Release: 8%{release_suffix}%{?dist}
4850
License: GPLv2
4951
Url: http://www.mellanox.com
5052
Group: System Environment/Base
@@ -111,6 +113,9 @@ fi # 1 : closed
111113
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-iser-*.conf
112114

113115
%changelog
116+
* Fri Apr 10 2026 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 25.07-8_6.12.57.1.6
117+
- Tweak specs to use dynamic versioning for kernel
118+
114119
* Fri Mar 27 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 25.07-7_6.12.78.2.1
115120
- Bump release to rebuild for new kernel release
116121

‎SPECS-SIGNED/iser-signed/iser-signed.spec‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,22 @@
3030
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
3131
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
3232

33-
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
34-
%global target_azl_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
35-
%global target_kernel_release %(/bin/rpm -q --queryformat '%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers) | /bin/cut -d . -f 1)
33+
%global target_azl_build_kernel_version %azl_kernel_version
34+
%global target_kernel_release %azl_kernel_release
35+
%global target_mlnx_ofa_kernel_version %azl_mlnx_ofa_kernel_version
36+
%global target_mlnx_ofa_kernel_release %azl_mlnx_ofa_kernel_release
37+
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3638
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3739

3840
%global KVERSION %{target_kernel_version_full}
3941

4042
%{!?_name: %define _name iser}
41-
%{!?_mofed_full_version: %define _mofed_full_version 25.07-1%{release_suffix}%{?dist}}
43+
%{!?_mofed_full_version: %define _mofed_full_version %{target_mlnx_ofa_kernel_version}-%{target_mlnx_ofa_kernel_release}%{?dist}}
4244

4345
Summary: %{_name} Driver
4446
Name: %{_name}-signed
4547
Version: 25.07
46-
Release: 1%{release_suffix}%{?dist}
48+
Release: 2%{release_suffix}%{?dist}
4749
License: GPLv2
4850
Url: http://www.mellanox.com
4951
Group: System Environment/Base
@@ -110,6 +112,9 @@ fi # 1 : closed
110112
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{_name}-*.conf
111113

112114
%changelog
115+
* Fri Apr 10 2026 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 25.07-2
116+
- Tweak specs to use dynamic versioning for kernel and mlnx_ofa_kernel versions.
117+
113118
* Tue Nov 04 2025 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 25.07-1
114119
- Upgrade version to 25.07.
115120

‎SPECS-SIGNED/isert-hwe-signed/isert-hwe-signed.spec‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,23 @@
3030
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
3131
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
3232

33-
# hard code versions due to ADO bug:58993948
34-
%global target_azl_build_kernel_version 6.12.78.2
35-
%global target_kernel_release 1
33+
34+
%global target_azl_build_kernel_version %azl_kernel_hwe_version
35+
%global target_kernel_release %azl_kernel_hwe_release
36+
%global target_mlnx_ofa_kernel_version %azl_mlnx_ofa_kernel_hwe_version
37+
%global target_mlnx_ofa_kernel_release %azl_mlnx_ofa_kernel_hwe_release
3638
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3739
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3840

3941
%global KVERSION %{target_kernel_version_full}
4042

4143
%{!?_name: %define _name isert-hwe}
42-
%{!?_mofed_full_version: %define _mofed_full_version 25.07-7%{release_suffix}%{?dist}}
44+
%{!?_mofed_full_version: %define _mofed_full_version %{target_mlnx_ofa_kernel_version}-%{target_mlnx_ofa_kernel_release}%{?dist}}
4345

4446
Summary: %{_name} Driver
4547
Name: %{_name}-signed
4648
Version: 25.07
47-
Release: 7%{release_suffix}%{?dist}
49+
Release: 8%{release_suffix}%{?dist}
4850
License: GPLv2
4951
Url: http://www.mellanox.com
5052
Group: System Environment/Base
@@ -110,6 +112,9 @@ fi # 1 : closed
110112
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-isert-*.conf
111113

112114
%changelog
115+
* Fri Apr 10 2026 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 25.07-8_6.12.57.1.6
116+
- Tweak specs to use dynamic versioning for kernel and mlnx_ofa_kernel versions.
117+
113118
* Fri Mar 27 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 25.07-7_6.12.78.2.1
114119
- Bump release to rebuild for new kernel release
115120

‎SPECS-SIGNED/isert-signed/isert-signed.spec‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,22 @@
3030
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
3131
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
3232

33-
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
34-
%global target_azl_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
35-
%global target_kernel_release %(/bin/rpm -q --queryformat '%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers) | /bin/cut -d . -f 1)
33+
%global target_azl_build_kernel_version %azl_kernel_version
34+
%global target_kernel_release %azl_kernel_release
35+
%global target_mlnx_ofa_kernel_version %azl_mlnx_ofa_kernel_version
36+
%global target_mlnx_ofa_kernel_release %azl_mlnx_ofa_kernel_release
37+
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3638
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3739

3840
%global KVERSION %{target_kernel_version_full}
3941

4042
%{!?_name: %define _name isert}
41-
%{!?_mofed_full_version: %define _mofed_full_version 25.07-1%{release_suffix}%{?dist}}
43+
%{!?_mofed_full_version: %define _mofed_full_version %{target_mlnx_ofa_kernel_version}-%{target_mlnx_ofa_kernel_release}%{?dist}}
4244

4345
Summary: %{_name} Driver
4446
Name: %{_name}-signed
4547
Version: 25.07
46-
Release: 1%{release_suffix}%{?dist}
48+
Release: 2%{release_suffix}%{?dist}
4749
License: GPLv2
4850
Url: http://www.mellanox.com
4951
Group: System Environment/Base
@@ -109,6 +111,9 @@ fi # 1 : closed
109111
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{_name}-*.conf
110112

111113
%changelog
114+
* Fri Apr 10 2026 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 25.07-2
115+
- Tweak specs to use dynamic versioning for kernel and mlnx_ofa_kernel versions.
116+
112117
* Tue Nov 04 2025 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 25.07-1
113118
- Upgrade version to 25.07.
114119

‎SPECS-SIGNED/knem-hwe-modules-signed/knem-hwe-modules-signed.spec‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
2828
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
2929

30-
# hard code versions due to ADO bug:58993948
31-
%global target_azl_build_kernel_version 6.12.78.2
32-
%global target_kernel_release 1
30+
31+
%global target_azl_build_kernel_version %azl_kernel_hwe_version
32+
%global target_kernel_release %azl_kernel_hwe_release
3333
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3434
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3535

@@ -44,7 +44,7 @@
4444
Summary: KNEM: High-Performance Intra-Node MPI Communication
4545
Name: %{_name}-signed
4646
Version: 1.1.4.90mlnx3
47-
Release: 31%{release_suffix}%{?dist}
47+
Release: 32%{release_suffix}%{?dist}
4848
Provides: knem-hwe-mlnx = %{version}-%{release}
4949
Obsoletes: knem-hwe-mlnx < %{version}-%{release}
5050
License: BSD and GPLv2
@@ -110,6 +110,9 @@ fi
110110
/lib/modules/
111111

112112
%changelog
113+
* Fri Apr 10 2026 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 1.1.4.90mlnx3-32_6.12.57.1.6
114+
- Tweak specs to use dynamic versioning for kernel
115+
113116
* Fri Mar 27 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.1.4.90mlnx3-31_6.12.78.2.1
114117
- Bump release to rebuild for new kernel release
115118

‎SPECS-SIGNED/knem-modules-signed/knem-modules-signed.spec‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
2828
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
2929

30-
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
31-
%global target_azl_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
32-
%global target_kernel_release %(/bin/rpm -q --queryformat '%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers) | /bin/cut -d . -f 1)
30+
%global target_azl_build_kernel_version %azl_kernel_version
31+
%global target_kernel_release %azl_kernel_release
32+
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3333
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3434

3535
%global KVERSION %{target_kernel_version_full}
@@ -43,7 +43,7 @@
4343
Summary: KNEM: High-Performance Intra-Node MPI Communication
4444
Name: %{_name}-signed
4545
Version: 1.1.4.90mlnx3
46-
Release: 22%{release_suffix}%{?dist}
46+
Release: 23%{release_suffix}%{?dist}
4747
Provides: knem-mlnx = %{version}-%{release}
4848
Obsoletes: knem-mlnx < %{version}-%{release}
4949
License: BSD and GPLv2
@@ -108,6 +108,9 @@ fi
108108
/lib/modules/
109109

110110
%changelog
111+
* Fri Apr 10 2026 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 1.1.4.90mlnx3-23
112+
- Tweak specs to use dynamic versioning for kernel
113+
111114
* Tue Nov 04 2025 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 1.1.4.90mlnx3-22
112115
- Bump release to rebuild for new release.
113116

‎SPECS-SIGNED/mft_kernel-hwe-signed/mft_kernel-hwe-signed.spec‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
44
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
55

6-
# hard code versions due to ADO bug:58993948
7-
%global target_azl_build_kernel_version 6.12.78.2
8-
%global target_kernel_release 1
6+
7+
%global target_azl_build_kernel_version %azl_kernel_hwe_version
8+
%global target_kernel_release %azl_kernel_hwe_release
99
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
1010
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
1111

@@ -15,7 +15,7 @@
1515
Name: %{_name}-signed
1616
Summary: %{_name} Kernel Module for the %{KVERSION} kernel
1717
Version: 4.33.0
18-
Release: 7%{release_suffix}%{?dist}
18+
Release: 8%{release_suffix}%{?dist}
1919
License: Dual BSD/GPLv2
2020
Group: System Environment/Kernel
2121

@@ -91,6 +91,9 @@ popd
9191
/lib/modules/%{KVERSION}/updates/
9292

9393
%changelog
94+
* Fri Apr 10 2026 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 4.33.0-8_6.12.57.1.6
95+
- Tweak specs to use dynamic versioning for kernel
96+
9497
* Fri Mar 27 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 4.33.0-7_6.12.78.2.1
9598
- Bump release to rebuild for new kernel release
9699

0 commit comments

Comments
 (0)