From a4d2c1608ae00cc58a30548cfb717616a07c3ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Fri, 17 Feb 2023 00:50:27 +0100 Subject: [PATCH] convert more users to %{openstack_stestr_run} Change-Id: Iacba1d08616dc52d7439785efec9aa8055c82f55 --- openstack/ceilometermiddleware/ceilometermiddleware.spec.j2 | 2 +- openstack/masakari/masakari.spec.j2 | 2 +- openstack/mistral/mistral.spec.j2 | 2 +- openstack/monasca-notification/monasca-notification.spec.j2 | 2 +- openstack/murano/murano.spec.j2 | 2 +- .../networking-generic-switch/networking-generic-switch.spec.j2 | 2 +- openstack/octavia-lib/octavia-lib.spec.j2 | 2 +- openstack/oslo.privsep/oslo.privsep.spec.j2 | 2 +- openstack/python-scciclient/python-scciclient.spec.j2 | 2 +- openstack/python-solumclient/python-solumclient.spec.j2 | 2 +- openstack/python-tackerclient/python-tackerclient.spec.j2 | 2 +- openstack/python-tripleoclient/python-tripleoclient.spec.j2 | 2 +- openstack/sahara/sahara.spec.j2 | 2 +- openstack/tripleo-common/tripleo-common.spec.j2 | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2 b/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2 index cab1dfa84..725a52eda 100644 --- a/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2 +++ b/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2 @@ -62,7 +62,7 @@ PBR_VERSION={{ upstream_version }} %sphinx_build -b html doc/source doc/build/ht rm -rf doc/build/html/.{doctrees,buildinfo} %check -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %install %py3_install diff --git a/openstack/masakari/masakari.spec.j2 b/openstack/masakari/masakari.spec.j2 index 8f0dcdbf5..ad65f4d7a 100644 --- a/openstack/masakari/masakari.spec.j2 +++ b/openstack/masakari/masakari.spec.j2 @@ -155,7 +155,7 @@ rm -rf %{buildroot}%{_prefix}%{_sysconfdir}/ %check # we don't want to check hacking rules rm masakari/tests/unit/test_hacking.py -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %post api %systemd_post openstack-masakari-api.service diff --git a/openstack/mistral/mistral.spec.j2 b/openstack/mistral/mistral.spec.j2 index fc91d464c..8f28867d4 100644 --- a/openstack/mistral/mistral.spec.j2 +++ b/openstack/mistral/mistral.spec.j2 @@ -188,7 +188,7 @@ chmod +x %{buildroot}%{_bindir}/mistral* %check # we don't want hacking/pep8 tests rm -r mistral/tests/unit/hacking/ -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %post %tmpfiles_create %{_tmpfilesdir}/%{name}.conf diff --git a/openstack/monasca-notification/monasca-notification.spec.j2 b/openstack/monasca-notification/monasca-notification.spec.j2 index 5d1085d78..eb741ba14 100644 --- a/openstack/monasca-notification/monasca-notification.spec.j2 +++ b/openstack/monasca-notification/monasca-notification.spec.j2 @@ -125,7 +125,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} # NOTE: RDO currenty does not have python-jira in the CI # NOTE: SUSE fails on a weird mock issue %if 0 -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %endif %pre diff --git a/openstack/murano/murano.spec.j2 b/openstack/murano/murano.spec.j2 index 4b2917715..3388b965f 100644 --- a/openstack/murano/murano.spec.j2 +++ b/openstack/murano/murano.spec.j2 @@ -211,7 +211,7 @@ install -p -D -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1/ %check # don't want to depend on hacking for package building rm murano/tests/unit/test_hacking.py -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %pre %openstack_pre_user_group_create murano murano /sbin/nologin diff --git a/openstack/networking-generic-switch/networking-generic-switch.spec.j2 b/openstack/networking-generic-switch/networking-generic-switch.spec.j2 index 5e447dec2..3a64df089 100644 --- a/openstack/networking-generic-switch/networking-generic-switch.spec.j2 +++ b/openstack/networking-generic-switch/networking-generic-switch.spec.j2 @@ -76,7 +76,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo} %fdupes %{buildroot}%{python3_sitelib} %check -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %files %license LICENSE diff --git a/openstack/octavia-lib/octavia-lib.spec.j2 b/openstack/octavia-lib/octavia-lib.spec.j2 index 5a19a9e73..5f4d52ed5 100644 --- a/openstack/octavia-lib/octavia-lib.spec.j2 +++ b/openstack/octavia-lib/octavia-lib.spec.j2 @@ -49,7 +49,7 @@ developers. %check # we don't want to depend on hacking rm -rf octavia_lib/tests/unit/hacking -python3 -m stestr.cli run +%{openstack_stestr_run} %files %license LICENSE diff --git a/openstack/oslo.privsep/oslo.privsep.spec.j2 b/openstack/oslo.privsep/oslo.privsep.spec.j2 index 8b59f2f4d..883049417 100644 --- a/openstack/oslo.privsep/oslo.privsep.spec.j2 +++ b/openstack/oslo.privsep/oslo.privsep.spec.j2 @@ -70,7 +70,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo} %check export PYTHONPATH=. -python3 -m stestr.cli run +%{openstack_stestr_run} %files -n {{ py2name(py_versions='py3') }} %doc README.rst diff --git a/openstack/python-scciclient/python-scciclient.spec.j2 b/openstack/python-scciclient/python-scciclient.spec.j2 index 1e53b7227..4a673e36d 100644 --- a/openstack/python-scciclient/python-scciclient.spec.j2 +++ b/openstack/python-scciclient/python-scciclient.spec.j2 @@ -68,7 +68,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo} %py3_install %check -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %files %doc README.rst diff --git a/openstack/python-solumclient/python-solumclient.spec.j2 b/openstack/python-solumclient/python-solumclient.spec.j2 index 01db0f2b7..ce0538cfe 100644 --- a/openstack/python-solumclient/python-solumclient.spec.j2 +++ b/openstack/python-solumclient/python-solumclient.spec.j2 @@ -85,7 +85,7 @@ rm -r doc/build/html/.{doctrees,buildinfo} %py3_install %check -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %files -n python3-solumclient %doc README.rst diff --git a/openstack/python-tackerclient/python-tackerclient.spec.j2 b/openstack/python-tackerclient/python-tackerclient.spec.j2 index c8e26a06d..aef2010c5 100644 --- a/openstack/python-tackerclient/python-tackerclient.spec.j2 +++ b/openstack/python-tackerclient/python-tackerclient.spec.j2 @@ -69,7 +69,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo} %{py3_install} %check -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %files %doc README.rst diff --git a/openstack/python-tripleoclient/python-tripleoclient.spec.j2 b/openstack/python-tripleoclient/python-tripleoclient.spec.j2 index 4a1375d5a..3ff675529 100644 --- a/openstack/python-tripleoclient/python-tripleoclient.spec.j2 +++ b/openstack/python-tripleoclient/python-tripleoclient.spec.j2 @@ -102,7 +102,7 @@ install -p -D -m 644 doc/build/man/python-tripleoclient.1 %{buildroot}%{_mandir} %check -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %files %doc README.rst diff --git a/openstack/sahara/sahara.spec.j2 b/openstack/sahara/sahara.spec.j2 index 95617eaac..9f1fb35be 100644 --- a/openstack/sahara/sahara.spec.j2 +++ b/openstack/sahara/sahara.spec.j2 @@ -217,7 +217,7 @@ rm sahara/tests/unit/utils/test_hacking.py # TODO: undo after https://storyboard.openstack.org/#!/story/2007450 rm -v sahara/tests/unit/service/health/test_verification_base.py -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %pre %openstack_pre_user_group_create sahara sahara /sbin/nologin diff --git a/openstack/tripleo-common/tripleo-common.spec.j2 b/openstack/tripleo-common/tripleo-common.spec.j2 index db78498e2..fe62c75b9 100644 --- a/openstack/tripleo-common/tripleo-common.spec.j2 +++ b/openstack/tripleo-common/tripleo-common.spec.j2 @@ -103,7 +103,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo} %check -%{__python3} -m stestr.cli run +%{openstack_stestr_run} %files %doc README.rst ChangeLog