From 623b50e8262e3781d810620038e7d785f7f285c1 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Tue, 12 Nov 2024 15:01:01 -0700
Subject: [PATCH] Revert to using containers, cleaned up MacOS workflow

---
 .github/workflows/test-linux.yml | 22 +++++++++-------------
 .github/workflows/test-macos.yml | 20 ++++++--------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index e602583..6f9ed35 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -32,10 +32,8 @@ jobs:
   Test:
     name: ${{ matrix.instance }}
     runs-on: ubuntu-latest
-    ## DGM use runner until have working systemd solution on containers
-    ## DGM runs-on: ubuntu-latest
-    ## DGM container:
-    ## DGM   image: ghcr.io/saltstack/salt-ci-containers/testing:${{ inputs.container-slug }}
+    container:
+      image: ghcr.io/saltstack/salt-ci-containers/testing:${{ inputs.container-slug }}
 
     timeout-minutes: ${{ inputs.timeout }}
     strategy:
@@ -69,10 +67,9 @@ jobs:
           # sed 1st - becomes space, 2nd - becomes dot
           ## DGM needs cleanup
           echo "matrix instance ,${{ matrix.instance }},"
-          vt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
-          vt_parms2=$(echo "$vt_parms" | sed 's/-/./')
-          vt_parm_ver=$(echo "$vt_parms2" | awk -F ' ' '{print $2}')
-          echo "vt parms ,$vt_parms, vt_parms2 ,$vt_parms2, vt_parms_ver ,$vt_parm_ver,"
+          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,"
           echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV
 
       - name: Bootstrap Salt
@@ -80,11 +77,10 @@ jobs:
           # sed 1st - becomes space, 2nd - becomes dot
           ## DGM needs cleanup
           echo "matrix instance ,${{ matrix.instance }},"
-          bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
-          bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
-          bt_arg1=$(echo "$bt_parms2" | awk -F ' ' '{print $1}')
-          bt_arg2=$(echo "$bt_parms2" | awk -F ' ' '{print $2}')
-          echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2,"
+          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}')
+          echo "bt parms ,$bt_parms, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2,"
           sudo 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 7aa78c7..2779cf1 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -57,25 +57,17 @@ 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/-/ /')
-          vt_parms2=$(echo "$vt_parms" | sed 's/-/./')
-          vt_parm_ver=$(echo "$vt_parms2" | awk -F ' ' '{print $2}')
-          echo "vt parms ,$vt_parms, vt_parms2 ,$vt_parms2, vt_parms_ver ,$vt_parm_ver,"
+          vt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./')
+          vt_parm_ver=$(echo "$vt_parms" | 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/-/ /')
-          bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
-          bt_arg1=$(echo "$bt_parms2" | awk -F ' ' '{print $1}')
-          bt_arg2=$(echo "$bt_parms2" | awk -F ' ' '{print $2}')
-          echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2,"
-          sudo sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
+          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}')
+          sudo sh ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
 
       - name: Test Bootstrap
         run: |