Start dbus service in docker environment

(cherry picked from commit 24ea896915acc8e1431e953ef6219e1be3d265af)
This commit is contained in:
wk333 2022-12-07 15:46:49 +08:00 committed by openeuler-sync-bot
parent 3db6ae4461
commit 9e03345ece

View File

@ -2,7 +2,7 @@
Name: ansible-2.9 Name: ansible-2.9
Summary: SSH-based configuration management, deployment, and task execution system Summary: SSH-based configuration management, deployment, and task execution system
Version: 2.9.24 Version: 2.9.24
Release: 2 Release: 3
License: GPLv3+ License: GPLv3+
Source0: https://releases.ansible.com/ansible/ansible-%{version}.tar.gz Source0: https://releases.ansible.com/ansible/ansible-%{version}.tar.gz
Source1: ansible.attr Source1: ansible.attr
@ -132,6 +132,12 @@ install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible
install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator
%check %check
# Start dbus service in docker environment, test_nmcli depends on the dbus service
if [ "%{_gpg_name}" != "private OBS" ] && [ ! -d /var/run/dbus ];then
mkdir -p /var/run/dbus
dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address
fi
ln -s /usr/bin/pytest-3 bin/pytest ln -s /usr/bin/pytest-3 bin/pytest
pathfix.py -i %{__python3} -p test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py pathfix.py -i %{__python3} -p test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py
rm -f test/units/modules/cloud/cloudstack/test_cs_traffic_type.py rm -f test/units/modules/cloud/cloudstack/test_cs_traffic_type.py
@ -168,6 +174,9 @@ make PYTHON=/usr/bin/python3 tests-py3
%{python3_sitelib}/ansible_test %{python3_sitelib}/ansible_test
%changelog %changelog
* Wed Dec 07 2022 wangkai <wangkai385@h-partners.com> - 2.9.24-3
- Start dbus service in docker environment
* Mon May 9 2022 yaoxin <yaoxin30@h-partners.com> - 2.9.24-2 * Mon May 9 2022 yaoxin <yaoxin30@h-partners.com> - 2.9.24-2
- Remove the python-nose compilation dependency and resolve the compilation error. - Remove the python-nose compilation dependency and resolve the compilation error.