From d0860c01c012ec2d651597dc5c02f87410fb4c95 Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Wed, 7 Dec 2022 15:46:49 +0800 Subject: [PATCH] Start dbus service in docker environment (cherry picked from commit 24ea896915acc8e1431e953ef6219e1be3d265af) --- ansible-2.9.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ansible-2.9.spec b/ansible-2.9.spec index 04856c1..5b01513 100644 --- a/ansible-2.9.spec +++ b/ansible-2.9.spec @@ -2,7 +2,7 @@ Name: ansible-2.9 Summary: SSH-based configuration management, deployment, and task execution system Version: 2.9.24 -Release: 2 +Release: 3 License: GPLv3+ Source0: https://releases.ansible.com/ansible/ansible-%{version}.tar.gz Source1: ansible.attr @@ -132,6 +132,12 @@ install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator %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 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 @@ -168,6 +174,9 @@ make PYTHON=/usr/bin/python3 tests-py3 %{python3_sitelib}/ansible_test %changelog +* Wed Dec 07 2022 wangkai - 2.9.24-3 +- Start dbus service in docker environment + * Mon May 9 2022 yaoxin - 2.9.24-2 - Remove the python-nose compilation dependency and resolve the compilation error. -- Gitee