rpm/salt
SHA256
1
0
Fork 0
forked from pool/salt
Code Pull Requests Activity

Accepting request 1145206 from home:ygutierrez:branches:systemsmanagement:saltstack

Browse Source 
- Enable multibuilld and create test flavor
- Additionally we require python-mock just for older Python versions.

OBS-URL: https://build.opensuse.org/request/show/1145206
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=231
This commit is contained in:
Pablo Suárez Hernández 2024-02-08 15:06:19 +00:00 committed by Git OBS Bridge
parent e3072d449f
commit a62a33befa
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_lastrevision
View File

@ -1 +1 @@
d0c2f35ff4a0b21786b20c884cbb191ad2e63904 d302875a0b75720b541027bbba6ec8561afa686d

3
_multibuild Normal file
View File

@ -0,0 +1,3 @@
<multibuild>
<flavor>testsuite_included</flavor>
</multibuild>

6
salt.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 8 12:17:39 UTC 2024 - Yeray Gutiérrez Cedrés <yeray.gutierrez@suse.com>
- Enable multibuilld and create test flavor
- Additionally we require python-mock just for older Python versions.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 5 09:55:33 UTC 2024 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com> Mon Feb 5 09:55:33 UTC 2024 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>

11
salt.spec
View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%global debug_package %{nil} %global debug_package %{nil}
%global flavor @BUILD_FLAVOR@%{nil}
%if 0%{?suse_version} > 1210 || 0%{?rhel} >= 7 || 0%{?fedora} >=28 %if 0%{?suse_version} > 1210 || 0%{?rhel} >= 7 || 0%{?fedora} >=28
%bcond_without systemd %bcond_without systemd
@ -464,7 +465,7 @@ BuildRequires: python3-packaging
# requirements/zeromq.txt # requirements/zeromq.txt
%if %{with test} %if %{with test}
BuildRequires: python3-boto >= 2.32.1 BuildRequires: python3-boto >= 2.32.1
BuildRequires: python3-mock BuildRequires: %{python3-mock if %python-base < 3.8}
BuildRequires: python3-moto >= 0.3.6 BuildRequires: python3-moto >= 0.3.6
BuildRequires: python3-pip BuildRequires: python3-pip
BuildRequires: python3-salt-testing >= 2015.2.16 BuildRequires: python3-salt-testing >= 2015.2.16
@ -701,6 +702,7 @@ Requires(pre): %fillup_prereq
Salt ssh is a master running without zmq. Salt ssh is a master running without zmq.
it enables the management of minions over a ssh connection. it enables the management of minions over a ssh connection.
%if "%{flavor}" == "testsuite_included"
%package -n python3-salt-testsuite %package -n python3-salt-testsuite
Summary: Unit and integration tests for Salt Summary: Unit and integration tests for Salt
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -712,7 +714,9 @@ Requires: python3-boto
%endif %endif
Requires: python3-boto3 Requires: python3-boto3
Requires: python3-docker Requires: python3-docker
%if 0%{?suse_version} < 1600
Requires: python3-mock Requires: python3-mock
%endif
Requires: python3-pygit2 Requires: python3-pygit2
Requires: python3-pytest >= 7.0.1 Requires: python3-pytest >= 7.0.1
Requires: python3-pytest-httpserver Requires: python3-pytest-httpserver
@ -725,6 +729,7 @@ Obsoletes: %{name}-tests
%description -n python3-salt-testsuite %description -n python3-salt-testsuite
Collection of unit, functional, and integration tests for %{name}. Collection of unit, functional, and integration tests for %{name}.
%endif
%if %{with bash_completion} %if %{with bash_completion}
%package bash-completion %package bash-completion
@ -871,6 +876,7 @@ install -Dd -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d/
# Install salt-support profiles # Install salt-support profiles
install -Dpm 0644 salt/cli/support/profiles/* %{buildroot}%{python3_sitelib}/salt/cli/support/profiles install -Dpm 0644 salt/cli/support/profiles/* %{buildroot}%{python3_sitelib}/salt/cli/support/profiles
%if "%{flavor}" == "testsuite_included"
# Install Salt tests # Install Salt tests
install -Dd %{buildroot}%{python3_sitelib}/salt-testsuite install -Dd %{buildroot}%{python3_sitelib}/salt-testsuite
cp -a tests %{buildroot}%{python3_sitelib}/salt-testsuite/ cp -a tests %{buildroot}%{python3_sitelib}/salt-testsuite/
@ -878,6 +884,7 @@ cp -a tests %{buildroot}%{python3_sitelib}/salt-testsuite/
rm %{buildroot}%{python3_sitelib}/salt-testsuite/tests/runtests.py rm %{buildroot}%{python3_sitelib}/salt-testsuite/tests/runtests.py
# Copy conf files to the testsuite as they are used by the tests # Copy conf files to the testsuite as they are used by the tests
cp -a conf %{buildroot}%{python3_sitelib}/salt-testsuite/ cp -a conf %{buildroot}%{python3_sitelib}/salt-testsuite/
%endif
## Install Zypper plugins only on SUSE machines ## Install Zypper plugins only on SUSE machines
%if 0%{?suse_version} %if 0%{?suse_version}
@ -1466,8 +1473,10 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version
%doc doc/_build/html %doc doc/_build/html
%endif %endif
%if "%{flavor}" == "testsuite_included"
%files -n python3-salt-testsuite %files -n python3-salt-testsuite
%{python3_sitelib}/salt-testsuite %{python3_sitelib}/salt-testsuite
%endif
%if %{with bash_completion} %if %{with bash_completion}
%files bash-completion %files bash-completion