From 7748d918d044dc78c66624ef4e768ff186de99a8 Mon Sep 17 00:00:00 2001 From: SumitJenaHCL Date: Thu, 14 May 2026 22:42:27 +0530 Subject: [PATCH] Resolve ptests failure --- SPECS/util-linux/util-linux.spec | 11 +++++++++-- .../manifests/package/pkggen_core_aarch64.txt | 6 +++--- .../manifests/package/pkggen_core_x86_64.txt | 6 +++--- .../manifests/package/toolchain_aarch64.txt | 12 ++++++------ .../resources/manifests/package/toolchain_x86_64.txt | 12 ++++++------ 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/SPECS/util-linux/util-linux.spec b/SPECS/util-linux/util-linux.spec index 1213eab7fc4..54281c8e36c 100644 --- a/SPECS/util-linux/util-linux.spec +++ b/SPECS/util-linux/util-linux.spec @@ -5,7 +5,7 @@ Summary: Utilities for file systems, consoles, partitions, and messages Name: util-linux Version: 2.40.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Vendor: Microsoft Corporation Distribution: Azure Linux @@ -121,7 +121,11 @@ install -vm644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/ %check chown -Rv nobody . -sudo -u nobody -s /bin/bash -c "PATH=$PATH make -k check" || exit 1 +sudo -u nobody -s /bin/bash -c \ + "PATH=$PATH make -k check TESTS_OPTIONS='--nonroot --show-diff --exclude=lslocks/lslocks'" || exit 1 +unshare --pid --fork --mount-proc --propagation unchanged \ + sudo -u nobody -s /bin/bash -c \ + "PATH=$PATH make -k check TESTS_COMPONENTS='lslocks/lslocks'" || exit 1 rm -rf %{buildroot}/lib/systemd/system %post -p /sbin/ldconfig @@ -174,6 +178,9 @@ rm -rf %{buildroot}/lib/systemd/system %{_mandir}/man3/* %changelog +* Thu May 14 2026 Sumit Jena - 2.40.2-5 +- Resolved flakyness in %check section. + * Wed Apr 08 2026 Azure Linux Security Servicing Account - 2.40.2-4 - Patch for CVE-2026-3184, CVE-2026-27456 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 594c1d5b9c5..4ce59dac773 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -70,9 +70,9 @@ make-4.4.1-2.azl3.aarch64.rpm patch-2.7.6-9.azl3.aarch64.rpm libcap-ng-0.8.4-1.azl3.aarch64.rpm libcap-ng-devel-0.8.4-1.azl3.aarch64.rpm -util-linux-2.40.2-4.azl3.aarch64.rpm -util-linux-devel-2.40.2-4.azl3.aarch64.rpm -util-linux-libs-2.40.2-4.azl3.aarch64.rpm +util-linux-2.40.2-5.azl3.aarch64.rpm +util-linux-devel-2.40.2-5.azl3.aarch64.rpm +util-linux-libs-2.40.2-5.azl3.aarch64.rpm tar-1.35-2.azl3.aarch64.rpm xz-5.4.4-3.azl3.aarch64.rpm xz-devel-5.4.4-3.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 4752b06361a..f088e6abbf6 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -70,9 +70,9 @@ make-4.4.1-2.azl3.x86_64.rpm patch-2.7.6-9.azl3.x86_64.rpm libcap-ng-0.8.4-1.azl3.x86_64.rpm libcap-ng-devel-0.8.4-1.azl3.x86_64.rpm -util-linux-2.40.2-4.azl3.x86_64.rpm -util-linux-devel-2.40.2-4.azl3.x86_64.rpm -util-linux-libs-2.40.2-4.azl3.x86_64.rpm +util-linux-2.40.2-5.azl3.x86_64.rpm +util-linux-devel-2.40.2-5.azl3.x86_64.rpm +util-linux-libs-2.40.2-5.azl3.x86_64.rpm tar-1.35-2.azl3.x86_64.rpm xz-5.4.4-3.azl3.x86_64.rpm xz-devel-5.4.4-3.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 475c5fb72d2..04ff6540607 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -542,7 +542,7 @@ python3-flit-core-3.9.0-1.azl3.noarch.rpm python3-gpg-1.23.2-2.azl3.aarch64.rpm python3-jinja2-3.1.2-3.azl3.noarch.rpm python3-libcap-ng-0.8.4-1.azl3.aarch64.rpm -python3-libmount-2.40.2-4.azl3.aarch64.rpm +python3-libmount-2.40.2-5.azl3.aarch64.rpm python3-libs-3.12.9-10.azl3.aarch64.rpm python3-libxml2-2.11.5-9.azl3.aarch64.rpm python3-lxml-4.9.3-2.azl3.aarch64.rpm @@ -599,11 +599,11 @@ texinfo-7.0.3-1.azl3.aarch64.rpm texinfo-debuginfo-7.0.3-1.azl3.aarch64.rpm unzip-6.0-22.azl3.aarch64.rpm unzip-debuginfo-6.0-22.azl3.aarch64.rpm -util-linux-2.40.2-4.azl3.aarch64.rpm -util-linux-debuginfo-2.40.2-4.azl3.aarch64.rpm -util-linux-devel-2.40.2-4.azl3.aarch64.rpm -util-linux-lang-2.40.2-4.azl3.aarch64.rpm -util-linux-libs-2.40.2-4.azl3.aarch64.rpm +util-linux-2.40.2-5.azl3.aarch64.rpm +util-linux-debuginfo-2.40.2-5.azl3.aarch64.rpm +util-linux-devel-2.40.2-5.azl3.aarch64.rpm +util-linux-lang-2.40.2-5.azl3.aarch64.rpm +util-linux-libs-2.40.2-5.azl3.aarch64.rpm which-2.21-8.azl3.aarch64.rpm which-debuginfo-2.21-8.azl3.aarch64.rpm xz-5.4.4-3.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 3d7c2696fd6..fdcf1c3a2e0 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -550,7 +550,7 @@ python3-flit-core-3.9.0-1.azl3.noarch.rpm python3-gpg-1.23.2-2.azl3.x86_64.rpm python3-jinja2-3.1.2-3.azl3.noarch.rpm python3-libcap-ng-0.8.4-1.azl3.x86_64.rpm -python3-libmount-2.40.2-4.azl3.x86_64.rpm +python3-libmount-2.40.2-5.azl3.x86_64.rpm python3-libs-3.12.9-10.azl3.x86_64.rpm python3-libxml2-2.11.5-9.azl3.x86_64.rpm python3-lxml-4.9.3-2.azl3.x86_64.rpm @@ -607,11 +607,11 @@ texinfo-7.0.3-1.azl3.x86_64.rpm texinfo-debuginfo-7.0.3-1.azl3.x86_64.rpm unzip-6.0-22.azl3.x86_64.rpm unzip-debuginfo-6.0-22.azl3.x86_64.rpm -util-linux-2.40.2-4.azl3.x86_64.rpm -util-linux-debuginfo-2.40.2-4.azl3.x86_64.rpm -util-linux-devel-2.40.2-4.azl3.x86_64.rpm -util-linux-lang-2.40.2-4.azl3.x86_64.rpm -util-linux-libs-2.40.2-4.azl3.x86_64.rpm +util-linux-2.40.2-5.azl3.x86_64.rpm +util-linux-debuginfo-2.40.2-5.azl3.x86_64.rpm +util-linux-devel-2.40.2-5.azl3.x86_64.rpm +util-linux-lang-2.40.2-5.azl3.x86_64.rpm +util-linux-libs-2.40.2-5.azl3.x86_64.rpm which-2.21-8.azl3.x86_64.rpm which-debuginfo-2.21-8.azl3.x86_64.rpm xz-5.4.4-3.azl3.x86_64.rpm