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 for MacOS 14 and pip

Browse source
This commit is contained in:
David Murphy 2024-11-21 12:34:43 -07:00
parent 9ef4b48bc5
commit bcffbb3aff
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,15 +49,11 @@ jobs:
- name: Install Python Dependencies with pip breakage - 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' ) }} if: ${{ ( inputs.distro-slug == 'debian-11' ) || ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }}
run: | 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 python3 -m pip install --break-system-packages -r tests/requirements.txt
- name: Install Python Dependencies without pip breakage - 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' ) }} if: ${{ ( inputs.distro-slug != 'debian-11' ) && ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }}
run: | 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 python3 -m pip install -r tests/requirements.txt
- name: Get Version - name: Get Version
@ -66,23 +62,15 @@ jobs:
# It is used to install via bootstrap and in the test # It is used to install via bootstrap and in the test
# The version is in the instance name # The version is in the instance name
# sed 1st - becomes space, 2nd - becomes dot # sed 1st - becomes space, 2nd - becomes dot
## DGM needs cleanup vt_parm_ver=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $2}')
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,"
echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV
- name: Bootstrap Salt - name: Bootstrap Salt
run: | run: |
# sed 1st - becomes space, 2nd - becomes dot # sed 1st - becomes space, 2nd - becomes dot
## DGM needs cleanup bt_arg1=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $1}')
echo "matrix instance ,${{ matrix.instance }}," bt_arg2=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $2}')
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," 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" sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
- name: Test Bootstrap - name: Test Bootstrap

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

@ -47,7 +47,13 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - 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: | run: |
python3 -m pip install -r tests/requirements.txt python3 -m pip install -r tests/requirements.txt