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

Updated testing

Browse source
This commit is contained in:
David Murphy 2024-11-11 16:29:34 -07:00
parent 22c7173a22
commit dbfd3b0f19
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
3 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,10 +61,12 @@ jobs:
- name: Bootstrap Salt
run: |
# sed 1st - becomes space, 2nd - becomes dot
echo "matrix instance ,${{ matrix.instance }},"
bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
echo "bt parms ,$bt_parms,"
sh -x ./bootstrap-salt.sh "$bt_parms"
bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2,"
sh -x ./bootstrap-salt.sh "$bt_parms2"
- name: Test Bootstrap
run: |

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

@ -53,10 +53,12 @@ jobs:
- name: Bootstrap Salt
run: |
# sed 1st - becomes space, 2nd - becomes dot
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"
bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2,"
sh -x ./bootstrap-salt.sh "$bt_parms2"
- name: Test Bootstrap
run: |

28
tests/integration/test_installation.py
View file

@ -39,22 +39,20 @@ def run_salt_call(cmd):
log.error(f"failed to produce output result, '{result}'")
else:
try:
cmdl = ["sudo"]
cmdl.extend(cmd)
cmdl.append("--out=json")
result = subprocess.run(cmdl, capture_output=True, text=True)
print(
f"DGM run_salt_call, cmdl '{cmdl}', result '{result}', stdout '{result.stdout}'",
flush=True,
)
if 0 == result.returncode:
json_data = json.loads(result.stdout)
else:
log.error(f"failed to produce output result, '{result}'")
cmdl = ["sudo"]
cmdl.extend(cmd)
cmdl.append("--out=json")
result = subprocess.run(cmdl, capture_output=True, text=True)
print(
f"DGM run_salt_call, cmdl '{cmdl}', result '{result}', stdout '{result.stdout}'",
flush=True,
)
if 0 == result.returncode:
json_data = json.loads(result.stdout)
else:
log.error(f"failed to produce output result, '{result}'")
finally:
return json_data["local"]
return json_data["local"]
def test_ping(path):