From 9d7ecd47cd18faf5f43fcccfd5805849a5526e325d1dc8c39bff714f1a68800d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= Date: Thu, 6 Jun 2024 12:44:27 +0000 Subject: [PATCH] Accepting request 1179004 from home:mczernek:branches:systemsmanagement:saltstack - Add a timer to delete old env post update for venv-minion - Added: * provide-systemd-timer-unit.patch OBS-URL: https://build.opensuse.org/request/show/1179004 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=244 --- _lastrevision | 2 +- provide-systemd-timer-unit.patch | 43 ++++++++++++++++++++++++++++++++ salt.changes | 8 ++++++ salt.spec | 2 ++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 provide-systemd-timer-unit.patch diff --git a/_lastrevision b/_lastrevision index 2652c56..266f848 100644 --- a/_lastrevision +++ b/_lastrevision @@ -1 +1 @@ -365aa2dd170197cd849f08270e3bd2376cd79be9 \ No newline at end of file +b64e3926ce9b365b4416429e48b567f34a5b818f \ No newline at end of file diff --git a/provide-systemd-timer-unit.patch b/provide-systemd-timer-unit.patch new file mode 100644 index 0000000..d6162ac --- /dev/null +++ b/provide-systemd-timer-unit.patch @@ -0,0 +1,43 @@ +From e3809178f7f6db4b0a5dcca48441100cec45c69d Mon Sep 17 00:00:00 2001 +From: Marek Czernek +Date: Thu, 6 Jun 2024 10:11:26 +0200 +Subject: [PATCH] Provide systemd timer unit + +--- + pkg/common/venv-salt-minion-postinstall.service | 7 +++++++ + pkg/common/venv-salt-minion-postinstall.timer | 9 +++++++++ + 2 files changed, 16 insertions(+) + create mode 100644 pkg/common/venv-salt-minion-postinstall.service + create mode 100644 pkg/common/venv-salt-minion-postinstall.timer + +diff --git a/pkg/common/venv-salt-minion-postinstall.service b/pkg/common/venv-salt-minion-postinstall.service +new file mode 100644 +index 00000000000..b122d7d6eab +--- /dev/null ++++ b/pkg/common/venv-salt-minion-postinstall.service +@@ -0,0 +1,7 @@ ++[Unit] ++Description=Clean old environment for venv-salt-minion ++ ++[Service] ++ExecStart=/bin/sh -c '/usr/lib/venv-salt-minion/bin/post_start_cleanup.sh || :' ++Type=oneshot ++ +diff --git a/pkg/common/venv-salt-minion-postinstall.timer b/pkg/common/venv-salt-minion-postinstall.timer +new file mode 100644 +index 00000000000..e6bd86d86e7 +--- /dev/null ++++ b/pkg/common/venv-salt-minion-postinstall.timer +@@ -0,0 +1,9 @@ ++[Unit] ++Description=Clean old venv-salt-minion environment in 60 seconds ++ ++[Timer] ++OnActiveSec=60 ++ ++[Install] ++WantedBy=timers.target ++ +-- +2.45.1 + diff --git a/salt.changes b/salt.changes index 89f0333..88e3320 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jun 6 08:41:14 UTC 2024 - Marek Czernek + +- Add a timer to delete old env post update for venv-minion + +- Added: + * provide-systemd-timer-unit.patch + ------------------------------------------------------------------- Mon May 27 11:07:26 UTC 2024 - Pablo Suárez Hernández diff --git a/salt.spec b/salt.spec index 5ecdc12..269b142 100644 --- a/salt.spec +++ b/salt.spec @@ -396,6 +396,8 @@ Patch117: do-not-call-the-async-wrapper-calls-with-the-separat.patch Patch118: speed-up-salt.matcher.confirm_top-by-using-__context.patch # PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/66593 Patch119: several-fixes-for-tests-to-avoid-errors-and-failures.patch +# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/656 +Patch120: provide-systemd-timer-unit.patch ### IMPORTANT: The line below is used as a snippet marker. Do not touch it. ### SALT PATCHES LIST END