From 99aa383e01d8602bf7b84b1e49bd359e98e15936 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Wed, 26 Mar 2025 12:11:53 -0400 Subject: [PATCH] soup and version updates --- VERSION | 2 +- salt/manager/tools/sbin/soup | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index bbcd1a024..7b4caac73 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.140 +2.4.141 diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index a0dd5916f..c0b7f6e1c 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -408,6 +408,7 @@ preupgrade_changes() { [[ "$INSTALLEDVERSION" == 2.4.111 ]] && up_to_2.4.120 [[ "$INSTALLEDVERSION" == 2.4.120 ]] && up_to_2.4.130 [[ "$INSTALLEDVERSION" == 2.4.130 ]] && up_to_2.4.140 + [[ "$INSTALLEDVERSION" == 2.4.140 ]] && up_to_2.4.141 true } @@ -433,6 +434,7 @@ postupgrade_changes() { [[ "$POSTVERSION" == 2.4.111 ]] && post_to_2.4.120 [[ "$POSTVERSION" == 2.4.120 ]] && post_to_2.4.130 [[ "$POSTVERSION" == 2.4.130 ]] && post_to_2.4.140 + [[ "$POSTVERSION" == 2.4.140 ]] && post_to_2.4.141 true } @@ -560,6 +562,11 @@ post_to_2.4.140() { POSTVERSION=2.4.140 } +post_to_2.4.141() { + echo "Nothing to apply" + POSTVERSION=2.4.141 +} + repo_sync() { echo "Sync the local repo." su socore -c '/usr/sbin/so-repo-sync' || fail "Unable to complete so-repo-sync." @@ -786,6 +793,12 @@ up_to_2.4.140() { INSTALLEDVERSION=2.4.140 } +up_to_2.4.141() { + echo "Nothing to do for 2.4.141" + + INSTALLEDVERSION=2.4.141 +} + add_hydra_pillars() { mkdir -p /opt/so/saltstack/local/pillar/hydra touch /opt/so/saltstack/local/pillar/hydra/soc_hydra.sls