From bcffbb3affbb81c46177774f59fdb7dddd074ac1 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Thu, 21 Nov 2024 12:34:43 -0700
Subject: [PATCH] Updated for MacOS 14 and pip

---
 .github/workflows/test-linux.yml | 18 +++---------------
 .github/workflows/test-macos.yml |  8 +++++++-
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 3d00473..120f23e 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -49,15 +49,11 @@ jobs:
       - name: Install Python Dependencies with pip breakage
         if: ${{ ( inputs.distro-slug == 'debian-11' ) || ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }}
         run: |
-          echo "DGM pip test for distro-slug ${{ inputs.distro-slug }}"
-          echo "DGM doing break-system-packages for distro-slug ${{ inputs.distro-slug }}"
           python3 -m pip install --break-system-packages -r tests/requirements.txt
 
       - name: Install Python Dependencies without pip breakage
         if: ${{ ( inputs.distro-slug != 'debian-11' ) && ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }}
         run: |
-          echo "DGM pip test for distro-slug ${{ inputs.distro-slug }}"
-          echo "DGM plain pip for distro-slug ${{ inputs.distro-slug }}"
           python3 -m pip install -r tests/requirements.txt
 
       - name: Get Version
@@ -66,23 +62,15 @@ jobs:
           # It is used to install via bootstrap and in the test
           # The version is in the instance name
           # sed 1st - becomes space, 2nd - becomes dot
-          ## DGM needs cleanup
-          echo "matrix instance ,${{ matrix.instance }},"
-          vt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./')
-          vt_parm_ver=$(echo "$vt_parms" | awk -F ' ' '{print $2}')
-          echo "vt parms ,$vt_parms, vt_parms_ver ,$vt_parm_ver,"
+          vt_parm_ver=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $2}')
           echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV
 
       - name: Bootstrap Salt
         run: |
           # sed 1st - becomes space, 2nd - becomes dot
-          ## DGM needs cleanup
-          echo "matrix instance ,${{ matrix.instance }},"
-          bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./')
-          bt_arg1=$(echo "$bt_parms" | awk -F ' ' '{print $1}')
-          bt_arg2=$(echo "$bt_parms" | awk -F ' ' '{print $2}')
+          bt_arg1=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $1}')
+          bt_arg2=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $2}')
           echo "bt parms ,$bt_parms, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2,"
-          ## DGM sudo sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
           sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
 
       - name: Test Bootstrap
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index d59bb5f..870fb59 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -47,7 +47,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Python Dependencies
+      - name: Install Python Dependencies with pip breakage
+        if: ${{ ( inputs.distro-slug != 'macos-12' ) && ( inputs.distro-slug != 'macos-13' ) }}
+        run: |
+          python3 -m pip install --break-system-packages -r tests/requirements.txt
+
+      - name: Install Python Dependencies without pip breakage
+        if: ${{ ( inputs.distro-slug == 'macos-12' ) || ( inputs.distro-slug == 'macos-13' ) }}
         run: |
           python3 -m pip install -r tests/requirements.txt