saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert to using containers, cleaned up MacOS workflow

Browse source
This commit is contained in:
David Murphy 2024-11-12 15:01:01 -07:00
parent 90c19c02f7
commit 623b50e826
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
2 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.github/workflows/test-linux.yml vendored
View file

@ -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

20
.github/workflows/test-macos.yml vendored
View file

@ -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: |