Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump plus3it/tardigrade-ci from 0.24.7 to 0.25.2 #511

Merged
merged 3 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM plus3it/tardigrade-ci:0.24.7
FROM plus3it/tardigrade-ci:0.25.2
8 changes: 4 additions & 4 deletions _modules/ash_linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def _rollback_fips_disable(installed_fips_pkgs):
__salt__["cmd.run"]("grubby --update-kernel=ALL --args=fips=1", python_shell=False)


def fips_disable(): # pylint: disable=too-many-branches
def fips_disable(): # pylint: disable=too-many-branches,inconsistent-return-statements
"""
Disables FIPS on RH/CentOS system.

Expand Down Expand Up @@ -212,7 +212,7 @@ def fips_disable(): # pylint: disable=too-many-branches
if "changes" not in ret and "comment" not in ret:
ret["comment"] = "FIPS mode is already disabled. No changes."
finally:
return ret # pylint: disable=lost-exception
return ret # pylint: disable=lost-exception,return-in-finally


def _rollback_fips_enable():
Expand All @@ -231,7 +231,7 @@ def _rollback_fips_enable():
)


def fips_enable(): # pylint: disable=too-many-branches
def fips_enable(): # pylint: disable=too-many-branches,inconsistent-return-statements
"""
Enable FIPS on RH/CentOS system.

Expand Down Expand Up @@ -296,7 +296,7 @@ def fips_enable(): # pylint: disable=too-many-branches
if "changes" not in ret and "comment" not in ret:
ret["comment"] = "FIPS mode is already enabled. No changes."
finally:
return ret # pylint: disable=lost-exception
return ret # pylint: disable=lost-exception,return-in-finally


def fips_status():
Expand Down
4 changes: 0 additions & 4 deletions tests/docker/centos7/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions tests/docker/centos8/Dockerfile

This file was deleted.

3 changes: 0 additions & 3 deletions tests/requirements-el7.txt

This file was deleted.

Empty file removed tests/requirements-el8.txt
Empty file.
Loading