Remove 107 from linux script, use 100

saltstack · Dec 6, 2024 · 0fcf979 · 0fcf979
1 parent d79ed4e
commit 0fcf979
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -319,7 +319,8 @@ test-salt-vmtools-linux:
     - cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
     - sudo -u root ps -ef | grep salt
     - systemctl is-active salt-minion
-    - sudo -u root ./svtminion.sh --stop --loglevel debug || { _retn=$?; if [[ ${_retn} -eq 107 ]]; then echo "test correct"; else echo "test failed, salt-minion should be stopped, returned '${_retn}'"; exit 1; fi; }
+    # VM Tools doesn't support 107 for now... until then we return 100
+    - sudo -u root ./svtminion.sh --stop --loglevel debug || { _retn=$?; if [[ ${_retn} -eq 100 ]]; then echo "test correct"; else echo "test failed, salt-minion should be stopped, returned '${_retn}'"; exit 1; fi; }
     - sudo -u root ps -ef | grep salt
     - systemctl is-active salt-minion || { echo "test correct"; }
     - sudo -u root ps -ef | grep salt
@@ -606,7 +607,8 @@ test-tags-salt-vmtools-linux:
     - cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
     - sudo -u root ps -ef | grep salt
     - sudo -u root systemctl is-active salt-minion
-    - sudo -u root ./svtminion.sh --stop --loglevel debug || { _retn=$?; if [[ ${_retn} -eq 107 ]]; then echo "test correct"; else echo "test failed, salt-minion should be stopped, returned '${_retn}'"; exit 1; fi; }
+    # VM Tools doesn't support 107 for now... until then we return 100
+    - sudo -u root ./svtminion.sh --stop --loglevel debug || { _retn=$?; if [[ ${_retn} -eq 100 ]]; then echo "test correct"; else echo "test failed, salt-minion should be stopped, returned '${_retn}'"; exit 1; fi; }
     - sudo -u root ps -ef | grep salt
     - systemctl is-active salt-minion || { echo "test correct"; }
     - sudo -u root ps -ef | grep salt

diff --git a/releases/1.7/svtminion.ps1 b/releases/1.7/svtminion.ps1
@@ -291,7 +291,7 @@ $STATUS_CODES = @{
     "removing" = 104;
     "removeFailed" = 105;
     "externalInstall" = 106;
-    "installedStopped" = 107;
+    "installedStopped" = 100;
     "scriptFailed" = 126;
     "scriptTerminated" = 130;
     100 = "installed";

diff --git a/tests/linux/test-linux.sh b/tests/linux/test-linux.sh
@@ -160,7 +160,8 @@ cat /etc/salt/minion
 cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
 ps -ef | grep salt
 systemctl is-active salt-minion
-./svtminion.sh --stop --loglevel debug || { _retn=$?; if [[ ${_retn} -eq 107 ]]; then echo "test correct"; else echo "test failed, salt-minion should be stopped, returned '${_retn}'"; exit 1; fi; }
+## VM Tools doesn't support 107 for now... until then we return 100
+./svtminion.sh --stop --loglevel debug || { _retn=$?; if [[ ${_retn} -eq 100 ]]; then echo "test correct"; else echo "test failed, salt-minion should be stopped, returned '${_retn}'"; exit 1; fi; }
 ps -ef | grep salt
 systemctl is-active salt-minion || { echo "test correct"; }
 ps -ef | grep salt

diff --git a/windows/svtminion.ps1 b/windows/svtminion.ps1
@@ -309,7 +309,9 @@ $STATUS_CODES = @{
     "removing" = 104;
     "removeFailed" = 105;
     "externalInstall" = 106;
-    "installedStopped" = 107;
+    # VM Tools currently doesn't support 107. We'll add this back
+    # once they do. So, until then, we just return 100
+    "installedStopped" = 100;
     "scriptFailed" = 126;
     "scriptTerminated" = 130;
     100 = "installed";
@@ -615,10 +617,7 @@ function Get-Status {
             $current_status = $STATUS_CODES["notInstalled"]
         } elseif ( $service_status -ne "Running" ) {
             Write-Log "Service not running" -Level debug
-            # VM Tools currently doesn't support this. We'll add this back
-            # once they do. So, until then, we just return installed
-            #$current_status = $STATUS_CODES["installedStopped"]
-            $current_status = $STATUS_CODES["installed"]
+            $current_status = $STATUS_CODES["installedStopped"]
         }
     }