Slim upgrade tests down to upgrade-specific checks

Drop binaries-present, PATH, and ping checks from the post-upgrade
battery on both platforms - those are generic install checks already
covered by the major/exact-version jobs. Keep status, service
running, config preservation, and version bump, since those are the
only things that actually exercise upgrade-specific behavior
(stop-old/start-new transition, config carried forward). Cuts
unnecessary work per upgrade CI job.

Author: twangboy

tests/linux/test-linux.sh

@@ -215,17 +215,15 @@ _run_upgrade_check() {
 
     ./svtminion.sh --upgrade --install --loglevel debug --minionversion "${_to}"
 
-    # Full battery after the upgrade - this is the state that matters.
+    # Only check things that relate to the upgrade itself - binaries
+    # present and ping are already covered by the fresh-install tests and
+    # don't exercise anything upgrade-specific.
     ./svtminion.sh --status --loglevel debug || { _retn=$?; if [[ ${_retn} -eq 100 ]]; then echo "test correct"; else echo "test failed, salt-minion should be installed after upgrade ${_from} -> ${_to}, returned '${_retn}'"; exit 1; fi; }
-    ls -alh /opt/saltstack/salt/salt-minion || { echo "test failed, salt-minion binary missing after upgrade ${_from} -> ${_to}"; exit 1; }
-    ls -alh /usr/bin/salt-call || { echo "test failed, salt-call binary missing after upgrade ${_from} -> ${_to}"; exit 1; }
-    ls -alh /usr/bin/salt-minion || { echo "test failed, salt-minion binary missing after upgrade ${_from} -> ${_to}"; exit 1; }
-    ps -ef | grep salt
     systemctl is-active salt-minion || { echo "test failed, salt-minion service not active after upgrade ${_from} -> ${_to}"; exit 1; }
-    cat /etc/salt/minion
+    # An upgrade preserves the existing config - the guest vars passed to
+    # the upgrade call above are expected to be ignored.
     cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null || { echo "test failed, master not preserved after upgrade ${_from} -> ${_to}"; exit 1; }
     cat /etc/salt/minion | grep 'id:\ tup' 1>/dev/null || { echo "test failed, id not preserved after upgrade ${_from} -> ${_to}"; exit 1; }
-    /usr/bin/salt-call --local test.ping | grep -qi "true" || { echo "test failed, salt-call test.ping failed after upgrade ${_from} -> ${_to}"; exit 1; }
     if [[ "$(/usr/bin/salt-call --local test.version --out=pprint | awk '{print $2}' | cut -d "'" -f 2)" != "${_to}" ]]; then echo "test failed, wrong version after upgrade ${_from} -> ${_to}"; exit 1; fi
 
     ./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; exit 1; }

tests/windows/integration/test_upgrade.ps1

@@ -52,6 +52,9 @@ function test_upgrade_steps {
         Write-Done
         $Upgrade = $false
 
+        # Only check things that relate to the upgrade itself - binaries
+        # present, path, and ping are already covered by the fresh-install
+        # tests and don't exercise anything upgrade-specific.
         try {
             $current_status = Get-ItemPropertyValue -Path $vmtools_base_reg -Name $vmtools_salt_minion_status_name
         } catch {
@@ -61,16 +64,10 @@ function test_upgrade_steps {
             $failed = 1; Write-Host "FAILED ($start_ver -> $upgrade_ver): status not installed"
         }
 
-        if (!(Test-Path $ssm_bin)) { $failed = 1; Write-Host "FAILED ($start_ver -> $upgrade_ver): ssm binary missing" }
-        if (!(Test-Path "$salt_dir\salt-call.exe")) { $failed = 1; Write-Host "FAILED ($start_ver -> $upgrade_ver): salt-call.exe missing" }
-        if (!(Test-Path "$salt_dir\salt-minion.exe")) { $failed = 1; Write-Host "FAILED ($start_ver -> $upgrade_ver): salt-minion.exe missing" }
-
         $service = Get-Service -Name salt-minion -ErrorAction SilentlyContinue
         if (!($service)) { $failed = 1; Write-Host "FAILED ($start_ver -> $upgrade_ver): service not registered" }
         elseif ($service.Status -ne "Running") { $failed = 1; Write-Host "FAILED ($start_ver -> $upgrade_ver): service not running" }
 
-        if (!(Test-Path $salt_config_file)) { $failed = 1; Write-Host "FAILED ($start_ver -> $upgrade_ver): config missing" }
-
         # An upgrade preserves the existing config - the guest vars passed to
         # the upgrade call above are expected to be ignored.
         $minion_not_found = 1
@@ -83,17 +80,6 @@ function test_upgrade_steps {
             $failed = 1; Write-Host "FAILED ($start_ver -> $upgrade_ver): config not preserved across upgrade"
         }
 
-        $path_reg_key = "HKLM:\System\CurrentControlSet\Control\Session Manager\Environment"
-        $current_path = (Get-ItemProperty -Path $path_reg_key -Name Path).Path
-        if (!($current_path -like "*$salt_dir*")) {
-            $failed = 1; Write-Host "FAILED ($start_ver -> $upgrade_ver): salt not added to path"
-        }
-
-        $result = & "$salt_dir\salt-call" --local test.ping
-        if (!($result -like "local:*") -or !($result -like "*True")) {
-            $failed = 1; Write-Host "FAILED ($start_ver -> $upgrade_ver): salt-call test.ping failed"
-        }
-
         $result = & "$salt_dir\salt-call" --version
         if (!($result -like "*$upgrade_ver*")) {
             $failed = 1