Update to 163
Resolves: RHEL-111405
This commit is contained in:
parent
88d30bc1c8
commit
99e5d79810
1
.gitignore
vendored
1
.gitignore
vendored
@ -124,3 +124,4 @@
|
||||
/osbuild-156.tar.gz
|
||||
/osbuild-158.tar.gz
|
||||
/osbuild-162.tar.gz
|
||||
/osbuild-163.tar.gz
|
||||
|
||||
41
osbuild.spec
41
osbuild.spec
@ -1,7 +1,7 @@
|
||||
%global forgeurl https://github.com/osbuild/osbuild
|
||||
%global selinuxtype targeted
|
||||
|
||||
Version: 162
|
||||
Version: 163
|
||||
|
||||
%forgemeta
|
||||
|
||||
@ -24,6 +24,19 @@ BuildRequires: python3-docutils
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: systemd
|
||||
|
||||
# for tests
|
||||
BuildRequires: python3-iniparse
|
||||
BuildRequires: python3-jsonschema
|
||||
BuildRequires: python3-kickstart
|
||||
BuildRequires: python3-mako
|
||||
BuildRequires: python3-PyYAML
|
||||
BuildRequires: python3-pytest
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: python3-license-expression
|
||||
BuildRequires: python3-pytest-xdist
|
||||
BuildRequires: python3-tomli-w
|
||||
%endif
|
||||
|
||||
Requires: bash
|
||||
Requires: bubblewrap
|
||||
Requires: coreutils
|
||||
@ -270,10 +283,27 @@ install -p -m 0644 tools/solver-dnf5.json %{buildroot}%{pkgdir}/solver.json
|
||||
install -p -m 0644 tools/solver-dnf.json %{buildroot}%{pkgdir}/solver.json
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
%check
|
||||
exit 0
|
||||
# We have some integration tests, but those require running a VM, so that would
|
||||
# be an overkill for RPM check script.
|
||||
# skip toml-writing tests in RHEL (no such library available there)
|
||||
# There is a bunch of tests failing on specific arch/OS combinations.
|
||||
# osbuild is a noarch package, meaning the architecture conditionals don't work.
|
||||
# The details of the failing tests are described in the comments.
|
||||
# Since we can't be granular enough, skip tests based on the OS only.
|
||||
# This means some tests won't be run even though they could,
|
||||
# but that's an acceptable tradeoff.
|
||||
# x86_64-specific tests:
|
||||
# test/mod/test_util_sbom_spdx.py, test/mod/test_util_sbom_dnf.py, test/mod/test_testutil_dnf4.py
|
||||
# test_ioctl_toggle_immutable and test_rmtree_immutable fail on s390x
|
||||
# test_cache_full_behavior fails on ppc64le
|
||||
# tools/test/test_depsolve.py fails on C9S and EPEL9
|
||||
ignore="--ignore test/mod/test_util_sbom_spdx.py --ignore test/mod/test_util_sbom_dnf.py --ignore test/mod/test_testutil_dnf4.py"
|
||||
skip="not test_ioctl_toggle_immutable and not test_rmtree_immutable and not test_cache_full_behavior"
|
||||
%if 0%{?rhel}
|
||||
ignore="$ignore --ignore tools/test/test_depsolve.py"
|
||||
%endif
|
||||
%pytest %{?fedora:-n auto} -v %{?rhel:-m "not tomlwrite"} ${ignore:-} -k "${skip:-}"
|
||||
%endif
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
@ -360,6 +390,9 @@ fi
|
||||
%{pkgdir}/solver.json
|
||||
|
||||
%changelog
|
||||
* Thu Oct 23 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 163-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Oct 09 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 162-1
|
||||
- New upstream release
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (osbuild-162.tar.gz) = ae0c8bb087c09c0ba95270913a8f22490d5dc1c16e77364c54f742772cbe2a6aa3dfed0ab65c72880de32867fd6048adfd9d1fd4040c6315eb6f9584415c79c2
|
||||
SHA512 (osbuild-163.tar.gz) = 091b8656cb89ce273798447d3b8d7519bf746056bf227b6b21646fbd9da5fb9ad6c2ec89065b804db5092255eb76c6e9a14736b4ce374dad35b158453f5a357f
|
||||
|
||||
Loading…
Reference in New Issue
Block a user