yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dist: rework totest-manager subpackage to provide new style service.

Browse Source
This commit is contained in:
Jimmy Berry 2017-10-09 20:51:12 -05:00
parent f50ea95e81
commit ac99db6147
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ SUBDIRS = factory-package-news abichecker
include Makefile.common include Makefile.common
pkgdata_BINS=devel-project leaper manager_42 repo_checker suppkg_rebuild update_crawler pkgdata_BINS=devel-project leaper manager_42 repo_checker suppkg_rebuild totest-manager update_crawler
pkgdata_SCRIPTS=$(wildcard *.py *.pl *.sh) pkgdata_SCRIPTS=$(wildcard *.py *.pl *.sh)
pkgdata_SCRIPTS+=bs_mirrorfull findfileconflicts pkgdata_SCRIPTS+=bs_mirrorfull findfileconflicts
pkgdata_DATA+=bs_copy metrics osclib $(wildcard *.pm *.testcase) pkgdata_DATA+=bs_copy metrics osclib $(wildcard *.pm *.testcase)

14
dist/package/openSUSE-release-tools.spec vendored
View File

@ -319,16 +319,19 @@ exit 0
%service_del_postun osrt-staging-bot-support-rebuild@.service %service_del_postun osrt-staging-bot-support-rebuild@.service
%pre totest-manager %pre totest-manager
%service_add_pre opensuse-totest-manager.service %service_add_pre osrt-totest-manager@.service
getent passwd osrt-totest-manager > /dev/null || \
useradd -r -m -s /sbin/nologin -c "user for openSUSE-release-tools-totest-manager" osrt-totest-manager
exit 0
%post totest-manager %post totest-manager
%service_add_post opensuse-totest-manager.service %service_add_post osrt-totest-manager@.service
%preun totest-manager %preun totest-manager
%service_del_preun opensuse-totest-manager.service %service_del_preun osrt-totest-manager@.service
%postun totest-manager %postun totest-manager
%service_del_postun opensuse-totest-manager.service %service_del_postun osrt-totest-manager@.service
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -426,8 +429,9 @@ exit 0
%files totest-manager %files totest-manager
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_unitdir}/opensuse-totest-manager.service %{_bindir}/osrt-totest-manager
%{_datadir}/%{source_dir}/totest-manager.py %{_datadir}/%{source_dir}/totest-manager.py
%{_unitdir}/osrt-totest-manager@.service
%files -n osclib %files -n osclib
%defattr(-,root,root,-) %defattr(-,root,root,-)

9
systemd/opensuse-totest-manager.service
View File

@ -1,9 +0,0 @@
[Unit]
Description=openSUSE Factory ToTest Manager
[Service]
Type=simple
ExecStart=/usr/bin/screen -DmS totest-manager /usr/share/osc-plugin-factory/totest-manager.py run --verbose --interval 15
ExecStop=/usr/bin/screen -S totest-manager -X quit
WorkingDirectory=/usr/share/osc-plugin-factory
User=_opensuse.org-totest-manager

8
systemd/osrt-totest-manager@.service Normal file
View File

@ -0,0 +1,8 @@
[Unit]
Description=openSUSE Release Tools: ToTest Manager for %i
[Service]
Type=simple
User=osrt-totest-manager
WorkingDirectory=~
ExecStart=/usr/bin/osrt-totest-manager --verbose run --interval 5 "%i"