pool/salt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Make Salt Bundle more tolerant to long running jobs (bsc#1228690)

Browse Source 
- Added:
  * enhance-cleanup-mechanism-after-salt-bundle-upgrade-.patch

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=262
This commit is contained in:
Marek Czernek 2024-10-10 12:40:07 +00:00 committed by Git OBS Bridge
parent 49c79ed27f
commit 4c35e9d114
4 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_lastrevision
View File

@ -1 +1 @@
1de50cc517e1ca25175eecfbdf87317aadb44d33
af4efe8013e54de4be818761003c5966c88b6c19

26
enhance-cleanup-mechanism-after-salt-bundle-upgrade-.patch Normal file
View File

@ -0,0 +1,26 @@
From 994ebca519945c86dc30f1510dff36b3261446c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
<psuarezhernandez@suse.com>
Date: Thu, 10 Oct 2024 11:51:02 +0100
Subject: [PATCH] Enhance cleanup mechanism after Salt Bundle upgrade
(bsc#1228690) (#685)
---
pkg/common/venv-salt-minion-postinstall.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/common/venv-salt-minion-postinstall.service b/pkg/common/venv-salt-minion-postinstall.service
index b122d7d6ea..c9db270435 100644
--- a/pkg/common/venv-salt-minion-postinstall.service
+++ b/pkg/common/venv-salt-minion-postinstall.service
@@ -2,6 +2,6 @@
Description=Clean old environment for venv-salt-minion
[Service]
-ExecStart=/bin/sh -c '/usr/lib/venv-salt-minion/bin/post_start_cleanup.sh || :'
+ExecStart=/bin/sh -c 'WAIT_IF_SALT_JOBS=1 /usr/lib/venv-salt-minion/bin/post_start_cleanup.sh || :'
Type=oneshot
--
2.46.1

8
salt.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Oct 10 11:19:52 UTC 2024 - Pablo Suárez Hernández <psuarezhernandez@suse.com>
- Make Salt Bundle more tolerant to long running jobs (bsc#1228690)
- Added:
* enhance-cleanup-mechanism-after-salt-bundle-upgrade-.patch
-------------------------------------------------------------------
Thu Oct 3 11:21:30 UTC 2024 - Marek Czernek <marek.czernek@suse.com>

2
salt.spec
View File

@ -450,6 +450,8 @@ Patch142: avoid-explicit-reading-of-etc-salt-minion-bsc-122035.patch
Patch143: fix-x509-test-fails-on-old-openssl-systems-682.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/684
Patch144: fix-x509-private-key-tests-and-test_suse-on-sle12-68.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/685
Patch145: enhance-cleanup-mechanism-after-salt-bundle-upgrade-.patch
### IMPORTANT: The line below is used as a snippet marker. Do not touch it.
### SALT PATCHES LIST END