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

Minor cleanup of commented out code

Browse source
This commit is contained in:
David Murphy 2024-05-16 09:00:35 -06:00 • committed by Daniel Wozniak
parent e2761de56b
commit 102afa6ac9
4 changed files with 2 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/backport.yml vendored
View file

@ -20,12 +20,14 @@ jobs:
github.event.pull_request.merged == true
&& (
contains(github.event.pull_request.labels.*.name, 'backport:master') ||
contains(github.event.pull_request.labels.*.name, 'backport:3007.x') ||
contains(github.event.pull_request.labels.*.name, 'backport:3006.x') ||
contains(github.event.pull_request.labels.*.name, 'backport:3005.x')
)
&& (
(github.event.action == 'labeled' && (
contains(github.event.pull_request.labels.*.name, 'backport:master') ||
contains(github.event.pull_request.labels.*.name, 'backport:3007.x') ||
contains(github.event.pull_request.labels.*.name, 'backport:3006.x') ||
contains(github.event.pull_request.labels.*.name, 'backport:3005.x')
))

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

@ -192,12 +192,6 @@ jobs:
run: |
tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }}
## 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: |
tools --timestamps --timeout-secs=1800 vm test --skip-requirements-install --print-system-information-only \

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

@ -191,12 +191,6 @@ jobs:
run: |
tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }}
## 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: |
tools --timestamps --timeout-secs=1800 vm test --skip-requirements-install --print-system-information-only \

27
tools/ci.py
View file

@ -791,28 +791,8 @@ def pkg_matrix(
if TYPE_CHECKING:
assert testing_releases
## DGM still_testing_3005 = False
## DGM for release_version in testing_releases:
## DGM if still_testing_3005:
## DGM break
## DGM if release_version < tools.utils.Version("3006.0"):
## DGM still_testing_3005 = True
## DGM if still_testing_3005 is False:
## DGM ctx.error(
## DGM f"No longer testing 3005.x releases please update {__file__} "
## DGM "and remove this error and the logic above the error. There may "
## DGM "be other places that need code removed as well."
## DGM )
## DGM ctx.exit(1)
adjusted_versions = []
for ver in testing_releases:
## DGM if ver < tools.utils.Version("3006.0"):
## DGM adjusted_versions.append((ver, "classic"))
## DGM adjusted_versions.append((ver, "tiamat"))
## DGM else:
## DGM adjusted_versions.append((ver, "relenv"))
adjusted_versions.append((ver, "relenv"))
ctx.info(f"Will look for the following versions: {adjusted_versions}")
@ -1330,13 +1310,6 @@ def get_testing_releases(
majors = sorted(
list(
{
## DGM version.major
## DGM for version in releases
## DGM # We aren't testing upgrades from anything before
## DGM # 3006.0 except the latest 3005.x
## DGM if version.major >= 3005
## DGM # We don't want to test 3007.? on the 3006.x branch
## DGM and version.major <= parsed_salt_version.major
# We aren't testing upgrades from anything before 3006.0
# and we don't want to test 3007.? on the 3006.x branch
version.major