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

dist: include suppkg_rebuild in staging-bot subpackage.

Browse Source
This commit is contained in:
Jimmy Berry 2017-10-09 21:09:44 -05:00
parent a072b21b01
commit 014d8cc07b
4 changed files with 31 additions and 1 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 repo_checker pkgdata_BINS=devel-project repo_checker suppkg_rebuild
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)

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

@ -252,6 +252,7 @@ exit 0
%service_add_pre osrt-staging-bot-devel-list.service %service_add_pre osrt-staging-bot-devel-list.service
%service_add_pre osrt-staging-bot-regular@.service %service_add_pre osrt-staging-bot-regular@.service
%service_add_pre osrt-staging-bot-reminder.service %service_add_pre osrt-staging-bot-reminder.service
%service_add_pre osrt-staging-bot-support-rebuild@.service
getent passwd osrt-staging-bot > /dev/null || \ getent passwd osrt-staging-bot > /dev/null || \
useradd -r -m -s /sbin/nologin -c "user for openSUSE-release-tools-staging-bot" osrt-staging-bot useradd -r -m -s /sbin/nologin -c "user for openSUSE-release-tools-staging-bot" osrt-staging-bot
exit 0 exit 0
@ -261,18 +262,21 @@ exit 0
%service_add_post osrt-staging-bot-devel-list.service %service_add_post osrt-staging-bot-devel-list.service
%service_add_post osrt-staging-bot-regular@.service %service_add_post osrt-staging-bot-regular@.service
%service_add_post osrt-staging-bot-reminder.service %service_add_post osrt-staging-bot-reminder.service
%service_add_post osrt-staging-bot-support-rebuild@.service
%preun staging-bot %preun staging-bot
%service_del_preun osrt-staging-bot-daily@.service %service_del_preun osrt-staging-bot-daily@.service
%service_del_preun osrt-staging-bot-devel-list.service %service_del_preun osrt-staging-bot-devel-list.service
%service_del_preun osrt-staging-bot-regular@.service %service_del_preun osrt-staging-bot-regular@.service
%service_del_preun osrt-staging-bot-reminder.service %service_del_preun osrt-staging-bot-reminder.service
%service_del_preun osrt-staging-bot-support-rebuild@.service
%postun staging-bot %postun staging-bot
%service_del_postun osrt-staging-bot-daily@.service %service_del_postun osrt-staging-bot-daily@.service
%service_del_postun osrt-staging-bot-devel-list.service %service_del_postun osrt-staging-bot-devel-list.service
%service_del_postun osrt-staging-bot-regular@.service %service_del_postun osrt-staging-bot-regular@.service
%service_del_postun osrt-staging-bot-reminder.service %service_del_postun osrt-staging-bot-reminder.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 opensuse-totest-manager.service
@ -297,6 +301,7 @@ exit 0
%exclude %{_datadir}/%{source_dir}/metrics.py %exclude %{_datadir}/%{source_dir}/metrics.py
%exclude %{_datadir}/%{source_dir}/repo_checker.pl %exclude %{_datadir}/%{source_dir}/repo_checker.pl
%exclude %{_datadir}/%{source_dir}/repo_checker.py %exclude %{_datadir}/%{source_dir}/repo_checker.py
%exclude %{_datadir}/%{source_dir}/suppkg_rebuild.py
%exclude %{_datadir}/%{source_dir}/totest-manager.py %exclude %{_datadir}/%{source_dir}/totest-manager.py
%exclude %{_datadir}/%{source_dir}/osclib %exclude %{_datadir}/%{source_dir}/osclib
%exclude %{_datadir}/%{source_dir}/osc-check_dups.py %exclude %{_datadir}/%{source_dir}/osc-check_dups.py
@ -342,7 +347,9 @@ exit 0
%files staging-bot %files staging-bot
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/osrt-devel-project %{_bindir}/osrt-devel-project
%{_bindir}/osrt-suppkg_rebuild
%{_datadir}/%{source_dir}/devel-project.py %{_datadir}/%{source_dir}/devel-project.py
%{_datadir}/%{source_dir}/suppkg_rebuild.py
%{_unitdir}/osrt-staging-bot-daily@.service %{_unitdir}/osrt-staging-bot-daily@.service
%{_unitdir}/osrt-staging-bot-daily@.timer %{_unitdir}/osrt-staging-bot-daily@.timer
%{_unitdir}/osrt-staging-bot-devel-list.service %{_unitdir}/osrt-staging-bot-devel-list.service
@ -351,6 +358,8 @@ exit 0
%{_unitdir}/osrt-staging-bot-regular@.timer %{_unitdir}/osrt-staging-bot-regular@.timer
%{_unitdir}/osrt-staging-bot-reminder.service %{_unitdir}/osrt-staging-bot-reminder.service
%{_unitdir}/osrt-staging-bot-reminder.timer %{_unitdir}/osrt-staging-bot-reminder.timer
%{_unitdir}/osrt-staging-bot-support-rebuild@.service
%{_unitdir}/osrt-staging-bot-support-rebuild@.timer
%files totest-manager %files totest-manager
%defattr(-,root,root,-) %defattr(-,root,root,-)

11
systemd/osrt-staging-bot-support-rebuild@.service Normal file
View File

@ -0,0 +1,11 @@
[Unit]
Description=openSUSE Release Tools: staging-bot regular for %i (rebuild staging project if support package staged)
[Service]
Type=oneshot
User=osrt-staging-bot
SyslogIdentifier=osrt-staging-bot
ExecStart=/usr/bin/osrt-suppkg_rebuild -p "%i"
[Install]
WantedBy=multi-user.target

10
systemd/osrt-staging-bot-support-rebuild@.timer Normal file
View File

@ -0,0 +1,10 @@
[Unit]
Description=openSUSE Release Tools: staging-bot regular for %i (rebuild staging project if support package staged)
[Timer]
OnBootSec=120
OnUnitInactiveSec=60 min
Unit=osrt-staging-bot-support-rebuild@%i.service
[Install]
WantedBy=timers.target