Debugging pip conditional

.github/workflows/test-linux.yml

@@ -47,9 +47,12 @@ jobs:
 
       - name: Install Python Dependencies
         run: |
+          echo "DGM pip test for distro-slug ${{ inputs.distro-slug }}"
           if [[ ${{ inputs.distro-slug }} == "debian-11" || ${{ inputs.distro-slug }} == "debian-12" || ${{ inputs.distro-slug }} == "debian-13" || ${{ inputs.distro-slug }} == "ubuntu-2404" ]]; then
+            echo "DGM doing break-system-packages for distro-slug ${{ inputs.distro-slug }}"
             python3 -m pip install --break-system-packages -r tests/requirements.txt
           else
+            echo "DGM plain pip for distro-slug ${{ inputs.distro-slug }}"
             python3 -m pip install -r tests/requirements.txt
           fi
 

.github/workflows/test-macos.yml

@@ -53,7 +53,10 @@ jobs:
 
       - name: Bootstrap Salt
         run: |
-          sudo sh -x ./bootstrap-salt.sh
+          echo "matrix instance ,${{ matrix.instance }},"
+          bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
+          echo "bt parms ,$bt_parms,"
+          sudo sh -x ./bootstrap-salt.sh $bt_parms
 
       - name: Test Bootstrap
         run: |

tests/integration/test_installation.py

@@ -15,7 +15,7 @@ def path():
         salt_path = "C:\\Program Files\\Salt Project\\Salt"
         if salt_path not in os.environ["path"]:
             os.environ["path"] = f'{os.environ["path"]};{salt_path}'
-    yield os.environ["path"]
+        yield os.environ["path"]
 
 
 def run_salt_call(cmd):
@@ -49,4 +49,4 @@ def test_target_salt_version(path, target_salt_version):
     cmd = ["salt-call", "--local", "grains.item", "saltversion", "--timeout=120"]
     result = run_salt_call(cmd)
     # Returns: {'saltversion': '3006.9+217.g53cfa53040'}
-    assert result["saltversion"] == target_salt_version
+    assert result["saltversion"] == target_salt_version