From 014d8cc07bebca2766193554009fa153d2e02b46 Mon Sep 17 00:00:00 2001
From: Jimmy Berry <jberry@suse.com>
Date: Mon, 9 Oct 2017 21:09:44 -0500
Subject: [PATCH] dist: include suppkg_rebuild in staging-bot subpackage.

---
 Makefile                                          |  2 +-
 dist/package/openSUSE-release-tools.spec          |  9 +++++++++
 systemd/osrt-staging-bot-support-rebuild@.service | 11 +++++++++++
 systemd/osrt-staging-bot-support-rebuild@.timer   | 10 ++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 systemd/osrt-staging-bot-support-rebuild@.service
 create mode 100644 systemd/osrt-staging-bot-support-rebuild@.timer

diff --git a/Makefile b/Makefile
index 50ff5b07..8f334d15 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ SUBDIRS = factory-package-news abichecker
 
 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+=bs_mirrorfull findfileconflicts
 pkgdata_DATA+=bs_copy metrics osclib $(wildcard *.pm *.testcase)
diff --git a/dist/package/openSUSE-release-tools.spec b/dist/package/openSUSE-release-tools.spec
index 7a0d45fb..1a753721 100644
--- a/dist/package/openSUSE-release-tools.spec
+++ b/dist/package/openSUSE-release-tools.spec
@@ -252,6 +252,7 @@ exit 0
 %service_add_pre osrt-staging-bot-devel-list.service
 %service_add_pre osrt-staging-bot-regular@.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 || \
   useradd -r -m -s /sbin/nologin -c "user for openSUSE-release-tools-staging-bot" osrt-staging-bot
 exit 0
@@ -261,18 +262,21 @@ exit 0
 %service_add_post osrt-staging-bot-devel-list.service
 %service_add_post osrt-staging-bot-regular@.service
 %service_add_post osrt-staging-bot-reminder.service
+%service_add_post osrt-staging-bot-support-rebuild@.service
 
 %preun staging-bot
 %service_del_preun osrt-staging-bot-daily@.service
 %service_del_preun osrt-staging-bot-devel-list.service
 %service_del_preun osrt-staging-bot-regular@.service
 %service_del_preun osrt-staging-bot-reminder.service
+%service_del_preun osrt-staging-bot-support-rebuild@.service
 
 %postun staging-bot
 %service_del_postun osrt-staging-bot-daily@.service
 %service_del_postun osrt-staging-bot-devel-list.service
 %service_del_postun osrt-staging-bot-regular@.service
 %service_del_postun osrt-staging-bot-reminder.service
+%service_del_postun osrt-staging-bot-support-rebuild@.service
 
 %pre totest-manager
 %service_add_pre opensuse-totest-manager.service
@@ -297,6 +301,7 @@ exit 0
 %exclude %{_datadir}/%{source_dir}/metrics.py
 %exclude %{_datadir}/%{source_dir}/repo_checker.pl
 %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}/osclib
 %exclude %{_datadir}/%{source_dir}/osc-check_dups.py
@@ -342,7 +347,9 @@ exit 0
 %files staging-bot
 %defattr(-,root,root,-)
 %{_bindir}/osrt-devel-project
+%{_bindir}/osrt-suppkg_rebuild
 %{_datadir}/%{source_dir}/devel-project.py
+%{_datadir}/%{source_dir}/suppkg_rebuild.py
 %{_unitdir}/osrt-staging-bot-daily@.service
 %{_unitdir}/osrt-staging-bot-daily@.timer
 %{_unitdir}/osrt-staging-bot-devel-list.service
@@ -351,6 +358,8 @@ exit 0
 %{_unitdir}/osrt-staging-bot-regular@.timer
 %{_unitdir}/osrt-staging-bot-reminder.service
 %{_unitdir}/osrt-staging-bot-reminder.timer
+%{_unitdir}/osrt-staging-bot-support-rebuild@.service
+%{_unitdir}/osrt-staging-bot-support-rebuild@.timer
 
 %files totest-manager
 %defattr(-,root,root,-)
diff --git a/systemd/osrt-staging-bot-support-rebuild@.service b/systemd/osrt-staging-bot-support-rebuild@.service
new file mode 100644
index 00000000..ff9d52d4
--- /dev/null
+++ b/systemd/osrt-staging-bot-support-rebuild@.service
@@ -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
diff --git a/systemd/osrt-staging-bot-support-rebuild@.timer b/systemd/osrt-staging-bot-support-rebuild@.timer
new file mode 100644
index 00000000..f0f74785
--- /dev/null
+++ b/systemd/osrt-staging-bot-support-rebuild@.timer
@@ -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