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

adjusting for command line arguments

Browse source
This commit is contained in:
David Murphy 2024-11-12 12:22:41 -07:00
parent ce84347128
commit 5a704ec503
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,7 @@ jobs:
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 "bt parms ,$vt_parms, vt_parms2 ,$vt_parms2, vt_parms_ver ,$vt_parm_ver,"
echo "vt parms ,$vt_parms, vt_parms2 ,$vt_parms2, vt_parms_ver ,$vt_parm_ver,"
echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV
- name: Bootstrap Salt
@ -80,8 +80,11 @@ jobs:
echo "matrix instance ,${{ matrix.instance }},"
bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2,"
sudo sh -x ./bootstrap-salt.sh "$bt_parms2"
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_parms2"
sudo sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
- name: Test Bootstrap
run: |

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

@ -61,7 +61,7 @@ jobs:
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 "bt parms ,$vt_parms, vt_parms2 ,$vt_parms2, vt_parms_ver ,$vt_parm_ver,"
echo "vt parms ,$vt_parms, vt_parms2 ,$vt_parms2, vt_parms_ver ,$vt_parm_ver,"
echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV
- name: Bootstrap Salt
@ -70,8 +70,11 @@ jobs:
echo "matrix instance ,${{ matrix.instance }},"
bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2,"
sudo sh -x ./bootstrap-salt.sh "$bt_parms2"
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_parms2"
sudo sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
- name: Test Bootstrap
run: |

4
bootstrap-salt.sh
View file

@ -618,9 +618,7 @@ __check_services_systemd_functional
# Define installation type
if [ "$#" -gt 0 ];then
__check_unparsed_options "$*"
## DGM ITYPE=$1
# get first arguement
ITYPE=$(echo $1 | awk -F ' ' '{print $1}')
ITYPE=$1
shift
fi