saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Disable classic upgrade - downgrade testing

Browse source
This commit is contained in:
David Murphy 2024-05-15 13:55:33 -06:00 • committed by Daniel Wozniak
parent 7f8dbe2ed2
commit c5632c7d10
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/test-packages-action-linux.yml vendored
View file

@ -192,11 +192,11 @@ jobs:
run: |
tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }}
- name: Downgrade importlib-metadata
if: ${{ contains(fromJSON('["amazonlinux-2", "centos-7"]'), inputs.distro-slug) && contains(fromJSON('["upgrade-classic", "downgrade-classic"]'), matrix.tests-chunk) }}
run: |
# This step can go away once we stop testing classic packages upgrade/downgrades to/from 3005.x
tools --timestamps vm ssh ${{ inputs.distro-slug }} -- "sudo python3 -m pip install -U 'importlib-metadata<=4.13.0' 'virtualenv<=20.21.1'"
## DGM - name: Downgrade importlib-metadata
## DGM if: ${{ contains(fromJSON('["amazonlinux-2", "centos-7"]'), inputs.distro-slug) && contains(fromJSON('["upgrade-classic", "downgrade-classic"]'), matrix.tests-chunk) }}
## DGM run: |
## DGM # This step can go away once we stop testing classic packages upgrade/downgrades to/from 3005.x
## DGM tools --timestamps vm ssh ${{ inputs.distro-slug }} -- "sudo python3 -m pip install -U 'importlib-metadata<=4.13.0' 'virtualenv<=20.21.1'"
- name: Show System Info
run: |

10
.github/workflows/test-packages-action-windows.yml vendored
View file

@ -191,11 +191,11 @@ jobs:
run: |
tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }}
- name: Downgrade importlib-metadata
if: ${{ contains(fromJSON('["amazonlinux-2", "centos-7"]'), inputs.distro-slug) && contains(fromJSON('["upgrade-classic", "downgrade-classic"]'), matrix.tests-chunk) }}
run: |
# This step can go away once we stop testing classic packages upgrade/downgrades to/from 3005.x
tools --timestamps vm ssh ${{ inputs.distro-slug }} -- "sudo python3 -m pip install -U 'importlib-metadata<=4.13.0' 'virtualenv<=20.21.1'"
## DGM - name: Downgrade importlib-metadata
## DGM if: ${{ contains(fromJSON('["amazonlinux-2", "centos-7"]'), inputs.distro-slug) && contains(fromJSON('["upgrade-classic", "downgrade-classic"]'), matrix.tests-chunk) }}
## DGM run: |
## DGM # This step can go away once we stop testing classic packages upgrade/downgrades to/from 3005.x
## DGM tools --timestamps vm ssh ${{ inputs.distro-slug }} -- "sudo python3 -m pip install -U 'importlib-metadata<=4.13.0' 'virtualenv<=20.21.1'"
- name: Show System Info
run: |

4
tests/pytests/pkg/upgrade/test_salt_upgrade.py
View file

@ -19,8 +19,12 @@ def _get_running_salt_minion_pid(
# and psutil is only returning the salt-minion once
pids = []
for proc in psutil.process_iter():
log.warning(f"DGM _get_running_salt_minion_pid, proc.name '{proc.name()}'")
if "salt" in proc.name():
cmdl_strg = " ".join(str(element) for element in proc.cmdline())
log.warning(
f"DGM _get_running_salt_minion_pid, proc.name exists, process_name '{process_name}', cmdl_strg '{cmdl_strg}'"
)
if process_name in cmdl_strg:
pids.append(proc.pid)